diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2019-12-16 17:21:38 +0100 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2019-12-17 16:00:31 +0000 |
| commit | 73d5deb4169ec71c97e17e451a182b259118661f (patch) | |
| tree | 5ef8c81c0bb10d5d4f0d11e4183a180637e595a0 /tests | |
| parent | 8b77afedbd4468fa57cd0dec48a5e6833365948a (diff) | |
Adapt source code to Qt 6
Change-Id: If84e3e4c832c2b3dc39e40be13e989996ab764d1
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@gmx.de>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/blackbox/tst_blackboxandroid.cpp | 4 | ||||
| -rw-r--r-- | tests/auto/language/tst_language.cpp | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/tests/auto/blackbox/tst_blackboxandroid.cpp b/tests/auto/blackbox/tst_blackboxandroid.cpp index e312c4493..371d15f10 100644 --- a/tests/auto/blackbox/tst_blackboxandroid.cpp +++ b/tests/auto/blackbox/tst_blackboxandroid.cpp @@ -390,7 +390,7 @@ void TestBlackboxAndroid::android_data() "lib/${ARCH}/liblib2.so", cxxLibPath("libstlport_shared.so", false)})) << QStringList(); - QByteArrayList expectedFiles1 = (commonFiles + QByteArrayList expectedFiles1 = qbs::toList(qbs::toSet(commonFiles + expandArchs(QByteArrayList{"armeabi-v7a", "x86"}, { "resources.arsc", "lib/${ARCH}/libgdbserver.so", @@ -400,7 +400,7 @@ void TestBlackboxAndroid::android_data() "resources.arsc", "lib/${ARCH}/libgdbserver.so", "lib/${ARCH}/libp1lib2.so", - cxxLibPath("libstlport_shared.so", false)})).toSet().toList(); + cxxLibPath("libstlport_shared.so", false)}))); QByteArrayList expectedFiles2 = commonFiles + expandArchs(archs, { "lib/${ARCH}/libgdbserver.so", "lib/${ARCH}/libp2lib1.so", diff --git a/tests/auto/language/tst_language.cpp b/tests/auto/language/tst_language.cpp index 31aebfa3a..4bf81ca65 100644 --- a/tests/auto/language/tst_language.cpp +++ b/tests/auto/language/tst_language.cpp @@ -3182,6 +3182,7 @@ void TestLanguage::wildcards() QFile projectFile(projectFilePath); QVERIFY(projectFile.open(QIODevice::WriteOnly)); QTextStream s(&projectFile); + using Qt::endl; s << "import qbs.base 1.0" << endl << endl << "Application {" << endl << " name: \"MyProduct\"" << endl; |