diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2017-10-20 10:36:52 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2017-10-20 10:48:22 +0200 |
| commit | e6d9b2d158497552dcbc1da0af6507df0633d7ee (patch) | |
| tree | 5e71bf5c24578918de22caab71be1432c62e96d4 /tests | |
| parent | 86381bff80292751d52a41bf7e1376ef4b723165 (diff) | |
| parent | 19abf216fdd8a54c2b8ec101631f378ce6b5bc6d (diff) | |
Merge 1.10 into master
Change-Id: I76e1f0c4a80fe1840311874e8ec63c8e17667473
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/api/testdata/transformers/transformers.qbs | 2 | ||||
| -rw-r--r-- | tests/auto/blackbox/tst_blackboxandroid.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/api/testdata/transformers/transformers.qbs b/tests/auto/api/testdata/transformers/transformers.qbs index 1e5a0ec4a..999395445 100644 --- a/tests/auto/api/testdata/transformers/transformers.qbs +++ b/tests/auto/api/testdata/transformers/transformers.qbs @@ -53,7 +53,7 @@ Project { cmd.highlight = "linker"; cmd.sourceCode = function () { File.remove(output.filePath); - var doc = new XmlDomDocument(); + var doc = new Xml.DomDocument(); var root = doc.createElement("root"); doc.appendChild(root); diff --git a/tests/auto/blackbox/tst_blackboxandroid.cpp b/tests/auto/blackbox/tst_blackboxandroid.cpp index 9d5a68d0c..599b4358b 100644 --- a/tests/auto/blackbox/tst_blackboxandroid.cpp +++ b/tests/auto/blackbox/tst_blackboxandroid.cpp @@ -152,7 +152,7 @@ void TestBlackboxAndroid::android_data() const Profile p("qbs_autotests-android", s.get()); QStringList archsStringList = p.value(QLatin1String("qbs.architectures")).toStringList(); if (archsStringList.isEmpty()) - archsStringList << QStringLiteral("armv5te"); + archsStringList << QStringLiteral("armv7a"); // must match default in common.qbs QByteArrayList archs; std::transform(archsStringList.begin(), archsStringList.end(), std::back_inserter(archs), [] (const QString &s) { |