diff options
| author | James McDonnell <jmcdonnell@qnx.com> | 2015-11-27 10:55:34 -0500 |
|---|---|---|
| committer | James McDonnell <jmcdonnell@qnx.com> | 2015-12-01 15:46:31 +0000 |
| commit | d76be5530a9e8915228db8deeaab3753aebc6367 (patch) | |
| tree | b97f60e9392ced94e88f1690e4673158eda66833 /tests/auto/other/compiler/compiler.pro | |
| parent | 5f00d18ad34979f57d6c17770ee9df5a2acb93e6 (diff) | |
Use correct test to add C++14 to the project configuration
Only add C++14 to the project configuration when C++14 support is
available on the platform. Adding it because the platform supports
C++11 doesn't work when the platform _only_ supports C++11 (e.g.,
QNX 6.6.0).
Task-number: QTBUG-49491
Change-Id: I15de38bb06d912a314b9dd18c80b513cc06a855e
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'tests/auto/other/compiler/compiler.pro')
| -rw-r--r-- | tests/auto/other/compiler/compiler.pro | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/auto/other/compiler/compiler.pro b/tests/auto/other/compiler/compiler.pro index 213429050f..356013c8f1 100644 --- a/tests/auto/other/compiler/compiler.pro +++ b/tests/auto/other/compiler/compiler.pro @@ -3,7 +3,8 @@ TARGET = tst_compiler SOURCES += tst_compiler.cpp baseclass.cpp derivedclass.cpp othersource.cpp HEADERS += baseclass.h derivedclass.h QT = core testlib -contains(QT_CONFIG, c++11): CONFIG += c++14 c++11 +contains(QT_CONFIG, c++11): CONFIG += c++11 +contains(QT_CONFIG, c++14): CONFIG += c++14 DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 |