diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2018-03-05 10:42:51 +0100 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2018-03-05 11:05:10 +0000 |
| commit | 90a0d19462a1f781382c355fda19969b54c27e73 (patch) | |
| tree | e6af4831f503f0244fe354e473dbb5fdc27c858e /tests/auto | |
| parent | d447d42bf2684b6021ec8238f46b59dc7a31b9ce (diff) | |
Qt templates: Fix detection of QtQuick compiler
In Qt 5.11, the features/qtquickcompiler.prf file is always present,
even if the QtQuick compiler is not.
Task-number: QBS-1299
Change-Id: Ibc7f925f1b1753d870ddad939fd510637c3b7642
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'tests/auto')
| -rw-r--r-- | tests/auto/blackbox/tst_blackboxqt.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/tests/auto/blackbox/tst_blackboxqt.cpp b/tests/auto/blackbox/tst_blackboxqt.cpp index 26d1dbd58..3f94f564b 100644 --- a/tests/auto/blackbox/tst_blackboxqt.cpp +++ b/tests/auto/blackbox/tst_blackboxqt.cpp @@ -270,6 +270,10 @@ void TestBlackboxQt::quickCompiler() QCOMPARE(m_qbsStdout.contains("compiling qml_subdir_test_qml.cpp"), hasCompiler); if (doesNotHaveCompiler) QSKIP("qtquickcompiler not available"); + QCOMPARE(runQbs(QbsRunParameters(QStringList{"config:off", + "modules.Qt.quick.useCompiler:false"})), 0); + QVERIFY2(m_qbsStdout.contains("compiling"), m_qbsStdout.constData()); + QVERIFY2(!m_qbsStdout.contains("compiling qml_subdir_test_qml.cpp"), m_qbsStdout.constData()); } void TestBlackboxQt::qtScxml() |