diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2018-03-16 09:28:08 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2018-03-16 09:28:08 +0100 |
| commit | cb84ae1a216b70e23d537229a4e67cd36bba4d43 (patch) | |
| tree | 873f8d0c024815c48e61ee8b9a52cf1a47299697 /tests/auto | |
| parent | f044e69f675f8dc12efee4a9715a3217ebd47a02 (diff) | |
| parent | fad75a3d566f730731fd715a77649ef8ebd57892 (diff) | |
Merge remote-tracking branch 'origin/4.6'
Conflicts:
src/plugins/android/androiddeployqtstep.cpp
src/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp
src/plugins/qmakeprojectmanager/wizards/testwizard.cpp
src/plugins/qtsupport/exampleslistmodel.cpp
src/plugins/qtsupport/gettingstartedwelcomepage.cpp
Change-Id: I126823f5f60613509520c07f52be7bc9d4f4367c
Diffstat (limited to 'tests/auto')
| -rw-r--r-- | tests/auto/profilewriter/profilewriter.qbs | 1 | ||||
| -rw-r--r-- | tests/auto/profilewriter/tst_profilewriter.cpp | 10 |
2 files changed, 6 insertions, 5 deletions
diff --git a/tests/auto/profilewriter/profilewriter.qbs b/tests/auto/profilewriter/profilewriter.qbs index 03de7d00d37..ba420c4817f 100644 --- a/tests/auto/profilewriter/profilewriter.qbs +++ b/tests/auto/profilewriter/profilewriter.qbs @@ -25,4 +25,5 @@ QtcAutotest { files: "tst_profilewriter.cpp" } cpp.includePaths: base.concat([proParserGroup.prefix]) + cpp.defines: base.concat("QT_USE_FAST_OPERATOR_PLUS") } diff --git a/tests/auto/profilewriter/tst_profilewriter.cpp b/tests/auto/profilewriter/tst_profilewriter.cpp index 999ac0ae41c..0e927e1e9a3 100644 --- a/tests/auto/profilewriter/tst_profilewriter.cpp +++ b/tests/auto/profilewriter/tst_profilewriter.cpp @@ -448,7 +448,7 @@ void tst_ProFileWriter::adds() QMakeVfs vfs; QMakeParser parser(0, &vfs, &parseHandler); - ProFile *proFile = parser.parsedProBlock(QStringRef(&input), QLatin1String(BASE_DIR "/test.pro"), 1); + ProFile *proFile = parser.parsedProBlock(QStringRef(&input), 0, QLatin1String(BASE_DIR "/test.pro"), 1); QVERIFY(proFile); PW::putVarValues(proFile, &lines, values, var, PW::PutFlags(flags), scope); proFile->deref(); @@ -619,7 +619,7 @@ void tst_ProFileWriter::removes() QMakeVfs vfs; QMakeParser parser(0, &vfs, &parseHandler); - ProFile *proFile = parser.parsedProBlock(QStringRef(&input), QLatin1String(BASE_DIR "/test.pro"), 1); + ProFile *proFile = parser.parsedProBlock(QStringRef(&input), 0, QLatin1String(BASE_DIR "/test.pro"), 1); QVERIFY(proFile); QmakeProjectManager::Internal::ProWriter::removeVarValues(proFile, &lines, values, vars); proFile->deref(); @@ -648,7 +648,7 @@ void tst_ProFileWriter::multiVar() QMakeVfs vfs; QMakeParser parser(0, &vfs, &parseHandler); - ProFile *proFile = parser.parsedProBlock(QStringRef(&input), QLatin1String(BASE_DIR "/test.pro"), 1); + ProFile *proFile = parser.parsedProBlock(QStringRef(&input), 0, QLatin1String(BASE_DIR "/test.pro"), 1); QVERIFY(proFile); QmakeProjectManager::Internal::ProWriter::removeFiles(proFile, &lines, baseDir, files, vars); proFile->deref(); @@ -669,7 +669,7 @@ void tst_ProFileWriter::addFiles() QMakeVfs vfs; QMakeParser parser(0, &vfs, &parseHandler); - ProFile *proFile = parser.parsedProBlock(QStringRef(&input), QLatin1String(BASE_DIR "/test.pro"), 1); + ProFile *proFile = parser.parsedProBlock(QStringRef(&input), 0, QLatin1String(BASE_DIR "/test.pro"), 1); QVERIFY(proFile); QmakeProjectManager::Internal::ProWriter::addFiles(proFile, &lines, QStringList() << QString::fromLatin1(BASE_DIR "/sub/bar.cpp"), @@ -691,7 +691,7 @@ void tst_ProFileWriter::removeFiles() QMakeVfs vfs; QMakeParser parser(0, &vfs, &parseHandler); - ProFile *proFile = parser.parsedProBlock(QStringRef(&input), QLatin1String(BASE_DIR "/test.pro"), 1); + ProFile *proFile = parser.parsedProBlock(QStringRef(&input), 0, QLatin1String(BASE_DIR "/test.pro"), 1); QVERIFY(proFile); QmakeProjectManager::Internal::ProWriter::removeFiles(proFile, &lines, QDir(BASE_DIR), QStringList() << QString::fromLatin1(BASE_DIR "/sub/bar.cpp"), |