diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-12-03 10:43:54 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2015-12-03 10:43:54 +0000 |
| commit | 3b6aafe9a76cdf7260e03375a94034589af6d791 (patch) | |
| tree | bef120cd2c8838e20af4b27db27d0f381302122c /tests/auto/corelib/tools/qlatin1string/qlatin1string.pro | |
| parent | e85ba9c67fc90a5076a0c00335bd47f17a68d437 (diff) | |
| parent | 72f5867f144cec8fc7848cbcc772683fe845652d (diff) | |
Merge "Merge remote-tracking branch 'origin/5.6' into dev" into refs/staging/dev
Diffstat (limited to 'tests/auto/corelib/tools/qlatin1string/qlatin1string.pro')
| -rw-r--r-- | tests/auto/corelib/tools/qlatin1string/qlatin1string.pro | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/auto/corelib/tools/qlatin1string/qlatin1string.pro b/tests/auto/corelib/tools/qlatin1string/qlatin1string.pro index 219afa661b..a996dab23e 100644 --- a/tests/auto/corelib/tools/qlatin1string/qlatin1string.pro +++ b/tests/auto/corelib/tools/qlatin1string/qlatin1string.pro @@ -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 |