diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2017-12-14 12:43:08 +0100 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2017-12-15 09:40:16 +0000 |
| commit | 193f3f02aae324ba7273e368b528b437da46caac (patch) | |
| tree | 39c436f0a6ca7c7b3fcfd71febc4dfb941c11ed2 /tests/auto/blackbox/tst_blackboxqt.cpp | |
| parent | 8eaef2035c2af7205e823eb9503721c29b0136a1 (diff) | |
Fix qtquickcompiler support for QML files in subdirectories
The input to the look-up function is a relative file path, not
necessarily just a file name as the code assumed.
Task-number: QBS-1261
Change-Id: Iaad4629ea92f327edc3dca7f012d82a00669994f
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
Diffstat (limited to 'tests/auto/blackbox/tst_blackboxqt.cpp')
| -rw-r--r-- | tests/auto/blackbox/tst_blackboxqt.cpp | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/tests/auto/blackbox/tst_blackboxqt.cpp b/tests/auto/blackbox/tst_blackboxqt.cpp index 501991a03..c21924b25 100644 --- a/tests/auto/blackbox/tst_blackboxqt.cpp +++ b/tests/auto/blackbox/tst_blackboxqt.cpp @@ -259,6 +259,18 @@ void TestBlackboxQt::qtKeywords() QCOMPARE(runQbs(params), 0); } +void TestBlackboxQt::quickCompiler() +{ + QDir::setCurrent(testDataDir + "/quick-compiler"); + QCOMPARE(runQbs(), 0); + 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); + if (doesNotHaveCompiler) + QSKIP("qtquickcompiler not available"); +} + void TestBlackboxQt::qtScxml() { QDir::setCurrent(testDataDir + "/qtscxml"); |