diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2017-12-22 11:27:55 +0100 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2017-12-22 11:27:55 +0100 |
| commit | 4dfff1d19b60adcc22405a1b525eb331960f1d28 (patch) | |
| tree | 29d5d1063860e7725cb159e0c5fc29fb76c02b91 /tests/auto/blackbox/tst_blackboxqt.cpp | |
| parent | e79281b26b1251e608feca121b5f08a37126a3e3 (diff) | |
| parent | 7862e87dc3ed3f7e2e6c8de936d6e15e914a02a4 (diff) | |
Merge 1.10 into master
Change-Id: Iecddc2722d22d7c15d4b32efd676fa8e7c00e99f
Diffstat (limited to 'tests/auto/blackbox/tst_blackboxqt.cpp')
| -rw-r--r-- | tests/auto/blackbox/tst_blackboxqt.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/blackbox/tst_blackboxqt.cpp b/tests/auto/blackbox/tst_blackboxqt.cpp index eba912b6b..151448a80 100644 --- a/tests/auto/blackbox/tst_blackboxqt.cpp +++ b/tests/auto/blackbox/tst_blackboxqt.cpp @@ -273,7 +273,7 @@ void TestBlackboxQt::quickCompiler() const bool hasCompiler = m_qbsStdout.contains("compiler available"); const bool doesNotHaveCompiler = m_qbsStdout.contains("compiler not available"); QVERIFY2(hasCompiler || doesNotHaveCompiler, m_qbsStdout.constData()); - QCOMPARE(m_qbsStdout.contains("compiling test_qml.cpp"), hasCompiler); + QCOMPARE(m_qbsStdout.contains("compiling qml_subdir_test_qml.cpp"), hasCompiler); if (doesNotHaveCompiler) QSKIP("qtquickcompiler not available"); } |