AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use correct test to add C++14 to the project configuration

Browse Source 
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>
This commit is contained in:
James McDonnell 2015-11-27 10:55:34 -05:00
parent 5f00d18ad3
commit d76be5530a
5 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tests/auto/corelib/global/qflags/qflags.pro
View File

@ -3,4 +3,5 @@ TARGET = tst_qflags
QT = core testlib
SOURCES = tst_qflags.cpp
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
contains(QT_CONFIG, c++11): CONFIG += c++11 c++14
contains(QT_CONFIG, c++11): CONFIG += c++11
contains(QT_CONFIG, c++14): CONFIG += c++14

3
tests/auto/corelib/global/qlogging/test/test.pro
View File

@ -1,6 +1,7 @@
CONFIG += testcase parallel_test
CONFIG -= app_bundle debug_and_release_target
contains(QT_CONFIG, c++11): CONFIG += c++11 c++14
contains(QT_CONFIG, c++11): CONFIG += c++11
contains(QT_CONFIG, c++14): CONFIG += c++14
TARGET = ../tst_qlogging
QT = core testlib
SOURCES = ../tst_qlogging.cpp

3
tests/auto/corelib/tools/qlatin1string/qlatin1string.pro
View File

@ -3,6 +3,7 @@ TARGET = tst_qlatin1string
QT = core testlib
SOURCES = tst_qlatin1string.cpp
DEFINES += QT_NO_CAST_TO_ASCII
contains(QT_CONFIG,c++11): CONFIG += c++11 c++14
contains(QT_CONFIG,c++11): CONFIG += c++11
contains(QT_CONFIG,c++14): CONFIG += c++14
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0

3
tests/auto/corelib/tools/qversionnumber/qversionnumber.pro
View File

@ -1,5 +1,6 @@
CONFIG += testcase parallel_test
contains(QT_CONFIG, c++11):CONFIG += c++11 c++14
contains(QT_CONFIG, c++11):CONFIG += c++11
contains(QT_CONFIG, c++14):CONFIG += c++14
TARGET = tst_qversionnumber
QT = core testlib
SOURCES = tst_qversionnumber.cpp

3
tests/auto/other/compiler/compiler.pro
View File

@ -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