Fix TestBlackboxQt::staticQtPluginLinking()

As of 3f80c821e9, we no longer link plugins into static libraries.

Change-Id: I35816d0d84b8758fb9792387bf450d53d7ea6e5a
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>

3 files changed, 18 insertions, 3 deletions

diff --git a/tests/auto/blackbox/testdata-qt/static-qt-plugin-linking/main.cpp b/tests/auto/blackbox/testdata-qt/static-qt-plugin-linking/main.cpp
new file mode 100644
index 000000000..d1bca9e2b
--- /dev/null
+++ b/tests/auto/blackbox/testdata-qt/static-qt-plugin-linking/main.cpp
@@ -0,0 +1,7 @@
+#include <QCoreApplication>
+
+int main(int argc, char *argv[])
+{
+    QCoreApplication app(argc, argv);
+    return app.exec();
+}
diff --git a/tests/auto/blackbox/testdata-qt/static-qt-plugin-linking/static-qt-plugin-linking.qbs b/tests/auto/blackbox/testdata-qt/static-qt-plugin-linking/static-qt-plugin-linking.qbs
index ed479c8f1..745fe5527 100644
--- a/tests/auto/blackbox/testdata-qt/static-qt-plugin-linking/static-qt-plugin-linking.qbs
+++ b/tests/auto/blackbox/testdata-qt/static-qt-plugin-linking/static-qt-plugin-linking.qbs
@@ -1,5 +1,5 @@
-StaticLibrary {
-    name: "somelib"
+Product {
+    name: "p"
     Probe {
         id: staticQtChecker
         property bool staticQt: Qt.core.staticBuild
@@ -10,6 +10,11 @@ StaticLibrary {
         }
     }
 
+    Group {
+        condition: type.contains("application")
+        files: "main.cpp"
+    }
+
     Depends { name: "Qt.core" }
     Depends { name: "Qt.gui" }
     Depends { name: "Qt.qminimal"; condition: Qt.core.staticBuild; }
diff --git a/tests/auto/blackbox/tst_blackboxqt.cpp b/tests/auto/blackbox/tst_blackboxqt.cpp
index 4428ddb1d..2b2b6814e 100644
--- a/tests/auto/blackbox/tst_blackboxqt.cpp
+++ b/tests/auto/blackbox/tst_blackboxqt.cpp
@@ -411,9 +411,12 @@ void TestBlackboxQt::removeMocHeaderFromFileList()
 void TestBlackboxQt::staticQtPluginLinking()
 {
     QDir::setCurrent(testDataDir + "/static-qt-plugin-linking");
-    QCOMPARE(runQbs(), 0);
+    QCOMPARE(runQbs(QStringList("products.p.type:application")), 0);
     const bool isStaticQt = m_qbsStdout.contains("Qt is static");
     QVERIFY2(m_qbsStdout.contains("Creating static import") == isStaticQt, m_qbsStdout.constData());
+    QCOMPARE(runQbs(QbsRunParameters("resolve", QStringList("products.p.type:staticlibrary"))), 0);
+    QCOMPARE(runQbs(), 0);
+    QVERIFY2(!m_qbsStdout.contains("Creating static import"), m_qbsStdout.constData());
 }
 
 void TestBlackboxQt::trackAddMocInclude()