From 2dcfe1c84b402db396038ed58582e72cd5a7713e Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Tue, 30 May 2017 18:54:54 +0300 Subject: [PATCH] Since Q5.4 available support C++14. --HG-- branch : develop --- src/app/tape/tape.pro | 9 +++++++-- src/app/valentina/valentina.pro | 9 +++++++-- src/libs/qmuparser/qmuparser.pro | 9 +++++++-- src/libs/vpropertyexplorer/vpropertyexplorer.pro | 9 +++++++-- src/test/CollectionTest/CollectionTest.pro | 11 +++++++++-- src/test/TranslationsTest/TranslationsTest.pro | 11 +++++++++-- src/test/ValentinaTest/ValentinaTest.pro | 11 +++++++++-- 7 files changed, 55 insertions(+), 14 deletions(-) diff --git a/src/app/tape/tape.pro b/src/app/tape/tape.pro index 7459dd71e..2500aceb5 100644 --- a/src/app/tape/tape.pro +++ b/src/app/tape/tape.pro @@ -18,8 +18,13 @@ TEMPLATE = app # Use out-of-source builds (shadow builds) CONFIG -= debug_and_release debug_and_release_target -# We use C++11 standard -CONFIG += c++11 +# Since Q5.4 available support C++14 +greaterThan(QT_MAJOR_VERSION, 4):greaterThan(QT_MINOR_VERSION, 3) { + CONFIG += c++14 +} else { + # We use C++11 standard + CONFIG += c++11 +} # Since Qt 5.4.0 the source code location is recorded only in debug builds. # We need this information also in release builds. For this need define QT_MESSAGELOGCONTEXT. diff --git a/src/app/valentina/valentina.pro b/src/app/valentina/valentina.pro index 8791d0daf..84b2fa0a4 100644 --- a/src/app/valentina/valentina.pro +++ b/src/app/valentina/valentina.pro @@ -26,8 +26,13 @@ macx{ # Use out-of-source builds (shadow builds) CONFIG -= debug_and_release debug_and_release_target -# We use C++11 standard -CONFIG += c++11 +# Since Q5.4 available support C++14 +greaterThan(QT_MAJOR_VERSION, 4):greaterThan(QT_MINOR_VERSION, 3) { + CONFIG += c++14 +} else { + # We use C++11 standard + CONFIG += c++11 +} # Since Qt 5.4.0 the source code location is recorded only in debug builds. # We need this information also in release builds. For this need define QT_MESSAGELOGCONTEXT. diff --git a/src/libs/qmuparser/qmuparser.pro b/src/libs/qmuparser/qmuparser.pro index 7342f5f1c..9d9d98c04 100644 --- a/src/libs/qmuparser/qmuparser.pro +++ b/src/libs/qmuparser/qmuparser.pro @@ -19,8 +19,13 @@ TEMPLATE = lib # Use out-of-source builds (shadow builds) CONFIG -= debug_and_release debug_and_release_target -# We use C++11 standard -CONFIG += c++11 +# Since Q5.4 available support C++14 +greaterThan(QT_MAJOR_VERSION, 4):greaterThan(QT_MINOR_VERSION, 3) { + CONFIG += c++14 +} else { + # We use C++11 standard + CONFIG += c++11 +} # Since Qt 5.4.0 the source code location is recorded only in debug builds. # We need this information also in release builds. For this need define QT_MESSAGELOGCONTEXT. diff --git a/src/libs/vpropertyexplorer/vpropertyexplorer.pro b/src/libs/vpropertyexplorer/vpropertyexplorer.pro index cd585beed..966b098c6 100644 --- a/src/libs/vpropertyexplorer/vpropertyexplorer.pro +++ b/src/libs/vpropertyexplorer/vpropertyexplorer.pro @@ -19,8 +19,13 @@ TARGET = vpropertyexplorer # We want create library TEMPLATE = lib -# We use C++11 standard -CONFIG += c++11 +# Since Q5.4 available support C++14 +greaterThan(QT_MAJOR_VERSION, 4):greaterThan(QT_MINOR_VERSION, 3) { + CONFIG += c++14 +} else { + # We use C++11 standard + CONFIG += c++11 +} # Since Qt 5.4.0 the source code location is recorded only in debug builds. # We need this information also in release builds. For this need define QT_MESSAGELOGCONTEXT. diff --git a/src/test/CollectionTest/CollectionTest.pro b/src/test/CollectionTest/CollectionTest.pro index 9a99bdb59..f65abc652 100644 --- a/src/test/CollectionTest/CollectionTest.pro +++ b/src/test/CollectionTest/CollectionTest.pro @@ -18,8 +18,15 @@ TEMPLATE = app # CONFIG += testcase adds a 'make check' which is great. But by default it also # adds a 'make install' that installs the test cases, which we do not want. # Can configure it not to do that with 'no_testcase_installs' -# We use C++11 standard -CONFIG += c++11 testcase no_testcase_installs +CONFIG += testcase no_testcase_installs + +# Since Q5.4 available support C++14 +greaterThan(QT_MAJOR_VERSION, 4):greaterThan(QT_MINOR_VERSION, 3) { + CONFIG += c++14 +} else { + # We use C++11 standard + CONFIG += c++11 +} # Use out-of-source builds (shadow builds) CONFIG -= app_bundle debug_and_release debug_and_release_target diff --git a/src/test/TranslationsTest/TranslationsTest.pro b/src/test/TranslationsTest/TranslationsTest.pro index 90763a514..d4f392b13 100644 --- a/src/test/TranslationsTest/TranslationsTest.pro +++ b/src/test/TranslationsTest/TranslationsTest.pro @@ -16,8 +16,15 @@ include(../../../common.pri) # CONFIG += testcase adds a 'make check' which is great. But by default it also # adds a 'make install' that installs the test cases, which we do not want. # Can configure it not to do that with 'no_testcase_installs' -# We use C++11 standard -CONFIG += c++11 testcase no_testcase_installs +CONFIG += testcase no_testcase_installs + +# Since Q5.4 available support C++14 +greaterThan(QT_MAJOR_VERSION, 4):greaterThan(QT_MINOR_VERSION, 3) { + CONFIG += c++14 +} else { + # We use C++11 standard + CONFIG += c++11 +} # Use out-of-source builds (shadow builds) CONFIG -= app_bundle debug_and_release debug_and_release_target diff --git a/src/test/ValentinaTest/ValentinaTest.pro b/src/test/ValentinaTest/ValentinaTest.pro index da404f8d1..a0587dac5 100644 --- a/src/test/ValentinaTest/ValentinaTest.pro +++ b/src/test/ValentinaTest/ValentinaTest.pro @@ -14,8 +14,15 @@ include(../../../common.pri) # CONFIG += testcase adds a 'make check' which is great. But by default it also # adds a 'make install' that installs the test cases, which we do not want. # Can configure it not to do that with 'no_testcase_installs' -# We use C++11 standard -CONFIG += c++11 testcase no_testcase_installs +CONFIG += testcase no_testcase_installs + +# Since Q5.4 available support C++14 +greaterThan(QT_MAJOR_VERSION, 4):greaterThan(QT_MINOR_VERSION, 3) { + CONFIG += c++14 +} else { + # We use C++11 standard + CONFIG += c++11 +} # Use out-of-source builds (shadow builds) CONFIG -= app_bundle debug_and_release debug_and_release_target