aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto/blackbox/tst_blackboxqt.cpp
diff options
context:
space:
mode:
authorChristian Kandeler <christian.kandeler@qt.io>2018-03-09 10:15:40 +0100
committerChristian Kandeler <christian.kandeler@qt.io>2018-03-09 10:15:40 +0100
commitb608f25a930710dc146e9e4ed99104be36de1024 (patch)
tree07f4f767f09b731d1b166bbe39fff88e995b3936 /tests/auto/blackbox/tst_blackboxqt.cpp
parente183c300f6daed0d000a2a70d46e9f001f97873f (diff)
parentabfc4c1b37d18515c8da0678a665886d7cb69af5 (diff)
Merge 1.11 into master
Diffstat (limited to 'tests/auto/blackbox/tst_blackboxqt.cpp')
-rw-r--r--tests/auto/blackbox/tst_blackboxqt.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/tests/auto/blackbox/tst_blackboxqt.cpp b/tests/auto/blackbox/tst_blackboxqt.cpp
index cb098a528..974e7b4db 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()