aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKitsune Ral <Kitsune-Ral@users.sf.net>2019-08-27 17:42:42 +0900
committerKitsune Ral <Kitsune-Ral@users.sf.net>2019-08-27 18:49:36 +0900
commitaf0f7e3ae58c1f28baa9fe1385d70eefbacc0e8a (patch)
treeeb3ac0bc51909d165983ee778e42816accbf61bb
parent97cac4b919735eb59493dd1cd528992ba90e611b (diff)
downloadlibquotient-af0f7e3ae58c1f28baa9fe1385d70eefbacc0e8a.tar.gz
libquotient-af0f7e3ae58c1f28baa9fe1385d70eefbacc0e8a.zip
libquotient.pri: use c++1z to help older qmake
CONFIG *= c++17 is available from Qt 5.12 only.
-rw-r--r--libquotient.pri3
-rw-r--r--qmc-example.pro4
2 files changed, 4 insertions, 3 deletions
diff --git a/libquotient.pri b/libquotient.pri
index b12373e8..cab9229d 100644
--- a/libquotient.pri
+++ b/libquotient.pri
@@ -1,5 +1,6 @@
QT += network multimedia
-CONFIG += c++17 warn_on rtti_off create_prl object_parallel_to_source
+# TODO: Having moved to Qt 5.12, replace c++1z with c++17 below
+CONFIG *= c++1z warn_on rtti_off create_prl object_parallel_to_source
win32-msvc* {
QMAKE_CXXFLAGS_WARN_ON += -wd4100 -wd4267
diff --git a/qmc-example.pro b/qmc-example.pro
index 4f3e922f..a9548df9 100644
--- a/qmc-example.pro
+++ b/qmc-example.pro
@@ -1,8 +1,8 @@
TEMPLATE = app
-CONFIG += c++17 warn_on object_parallel_to_source
+CONFIG *= c++1z warn_on object_parallel_to_source
-windows { CONFIG += console }
+windows { CONFIG *= console }
include(libquotient.pri)