Make Qt build variants logic more sensible.v1.3.2

We no longer force the Qt build variant to match the build variant
of the application linking against it (except for MSVC, where that
is required).

Change-Id: Ie2c80fbb0d688cdcbab57ad638aaccbbd6988a22
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>

1 files changed, 20 insertions, 0 deletions

diff --git a/tests/auto/blackbox/tst_blackbox.cpp b/tests/auto/blackbox/tst_blackbox.cpp
index d8a4f0e73..cde04882e 100644
--- a/tests/auto/blackbox/tst_blackbox.cpp
+++ b/tests/auto/blackbox/tst_blackbox.cpp
@@ -1826,6 +1826,26 @@ void TestBlackbox::inheritQbsSearchPaths()
     QCOMPARE(runQbs(), 0);
 }
 
+void TestBlackbox::mixedBuildVariants()
+{
+    QDir::setCurrent(testDataDir + "/mixed-build-variants");
+    Settings settings((QString()));
+    Profile profile(buildProfileName, &settings);
+    if (profile.value("qbs.toolchain").toStringList().contains("msvc")) {
+        QbsRunParameters params;
+        params.expectFailure = true;
+        QVERIFY(runQbs(params) != 0);
+        QVERIFY2(m_qbsStderr.contains("not allowed"), m_qbsStderr.constData());
+    } else if (!profile.value("Qt.core.availableBuildVariants").toStringList().contains("release")) {
+        QbsRunParameters params;
+        params.expectFailure = true;
+        QVERIFY(runQbs(params) != 0);
+        QVERIFY2(m_qbsStderr.contains("not supported"), m_qbsStderr.constData());
+    } else {
+        QCOMPARE(runQbs(), 0);
+    }
+}
+
 void TestBlackbox::mocCppIncluded()
 {
     QDir::setCurrent(testDataDir + "/moc_hpp_included");