diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2018-06-08 14:55:29 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2018-06-08 15:13:47 +0200 |
| commit | 073fda0ab536b5610ff1b9191db582791552509e (patch) | |
| tree | 16f0bbacc116e93778e9490ba2c2d9efff738d35 /tests/auto/blackbox/tst_blackboxqt.cpp | |
| parent | 9349866b37118db9179d1f0689e872ca1260f040 (diff) | |
| parent | 5f71b2220f9ff6838799c407972309bff1e8fc96 (diff) | |
Merge 1.12 into master
Change-Id: I0c914674c0728a7f7bc70fd9608914b95ef55a30
Diffstat (limited to 'tests/auto/blackbox/tst_blackboxqt.cpp')
| -rw-r--r-- | tests/auto/blackbox/tst_blackboxqt.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/tests/auto/blackbox/tst_blackboxqt.cpp b/tests/auto/blackbox/tst_blackboxqt.cpp index 93eb68f80..03e52590b 100644 --- a/tests/auto/blackbox/tst_blackboxqt.cpp +++ b/tests/auto/blackbox/tst_blackboxqt.cpp @@ -77,7 +77,11 @@ void TestBlackboxQt::cachedQml() QDir::setCurrent(testDataDir + "/cached-qml"); QCOMPARE(runQbs(), 0); QString dataDir = relativeBuildDir() + "/install-root/data"; - if (QFile::exists(dataDir + "/main.cpp")) { + QVERIFY2(m_qbsStdout.contains("qmlcachegen must work: true") + || m_qbsStdout.contains("qmlcachegen must work: false"), + m_qbsStdout.constData()); + if (m_qbsStdout.contains("qmlcachegen must work: false") + && QFile::exists(dataDir + "/main.cpp")) { // If C++ source files were installed then Qt.qmlcache is not available. See project file. QSKIP("No QML cache files generated."); } |