1 files changed, 44 insertions, 14 deletions

diff --git a/tests/auto/blackbox/tst_blackboxqt.cpp b/tests/auto/blackbox/tst_blackboxqt.cpp
index 620cd2fa7..b083a97e8 100644
--- a/tests/auto/blackbox/tst_blackboxqt.cpp
+++ b/tests/auto/blackbox/tst_blackboxqt.cpp
@@ -38,7 +38,6 @@
 #define WAIT_FOR_NEW_TIMESTAMP() waitForNewTimestamp(testDataDir)
 
 using qbs::Internal::HostOsInfo;
-using qbs::Profile;
 
 TestBlackboxQt::TestBlackboxQt() : TestBlackboxBase (SRCDIR "/testdata-qt", "blackbox-qt")
 {
@@ -240,7 +239,7 @@ void TestBlackboxQt::mixedBuildVariants()
 {
     QDir::setCurrent(testDataDir + "/mixed-build-variants");
     const SettingsPtr s = settings();
-    Profile profile(profileName(), s.get());
+    qbs::Profile profile(profileName(), s.get());
     if (profileToolchain(profile).contains("msvc")) {
         QbsRunParameters params;
         params.arguments << "qbs.buildVariant:debug";
@@ -376,6 +375,7 @@ void TestBlackboxQt::pkgconfigQt()
     QbsRunParameters params("build", {"-f", "pkgconfig-qt.qbs"});
     // need to override prefix for the downloaded Qt
     params.environment.insert("PKG_CONFIG_QT5CORE_PREFIX", prefix);
+    params.environment.insert("PKG_CONFIG_QT6CORE_PREFIX", prefix);
     params.arguments << "moduleProviders.qbspkgconfig.extraPaths:" + pkgConfigPath;
     params.arguments << arguments;
 
@@ -392,6 +392,22 @@ void TestBlackboxQt::pkgconfigQt_data()
     QTest::newRow("pkgconfig") << QStringList() << true;
     QTest::newRow("dummy")
             << QStringList({"products.p.qbsModuleProviders:dummyProvider"}) << false;
+    QTest::newRow("cross-compiling")
+            << QStringList({"moduleProviders.qbspkgconfig.sysroot:/some/fake/sysroot"}) << false;
+}
+
+void TestBlackboxQt::pkgconfigNoQt()
+{
+    QDir::setCurrent(testDataDir + "/pkgconfig-qt");
+    rmDirR(relativeBuildDir());
+    QbsRunParameters params("build", {"-f", "pkgconfig-qt.qbs"});
+    params.arguments << "moduleProviders.qbspkgconfig.libDirs:nonexistent";
+    params.expectFailure = true;
+
+    QCOMPARE(runQbs(params) == 0, false);
+    QVERIFY2(m_qbsStderr.contains("Dependency 'Qt.core' not found for product 'p'"), m_qbsStderr);
+    // QBS-1777: basic check for JS exceptions in case of missing Qt
+    QVERIFY2(!m_qbsStderr.contains("Error executing provider for module 'Qt.core'"), m_qbsStderr);
 }
 
 void TestBlackboxQt::pluginMetaData()
@@ -467,22 +483,36 @@ void TestBlackboxQt::pluginSupport()
     }
 }
 
+void TestBlackboxQt::qdoc()
+{
+    QDir::setCurrent(testDataDir + "/qdoc");
+    QCOMPARE(runQbs(QbsRunParameters("resolve")), 0);
+    if (m_qbsStdout.contains("Qt is too old"))
+        QSKIP("Skip test since qdoc3 does not work properly");
+    QCOMPARE(runQbs(), 0);
+    QVERIFY(QFileInfo(relativeProductBuildDir("QDoc Test") + "/qdoctest.qch").exists());
+}
+
 void TestBlackboxQt::qmlDebugging()
 {
     QDir::setCurrent(testDataDir + "/qml-debugging");
     QCOMPARE(runQbs(), 0);
-    const SettingsPtr s = settings();
-    Profile profile(profileName(), s.get());
-    if (!profileToolchain(profile).contains("gcc"))
-        return;
+
+    const bool isGcc = m_qbsStdout.contains("is gcc: true");
+    const bool isNotGcc = m_qbsStdout.contains("is gcc: false");
+    if (isNotGcc)
+        QSKIP("The remainder of this test only applies to gcc");
+    QVERIFY(isGcc);
+
     QProcess nm;
     nm.start("nm", QStringList(relativeExecutableFilePath("debuggable-app")));
-    if (nm.waitForStarted()) { // Let's ignore hosts without nm.
-        QVERIFY2(nm.waitForFinished(), qPrintable(nm.errorString()));
-        QVERIFY2(nm.exitCode() == 0, nm.readAllStandardError().constData());
-        const QByteArray output = nm.readAllStandardOutput();
-        QVERIFY2(output.toLower().contains("debugginghelper"), output.constData());
-    }
+    if (!nm.waitForStarted())
+        QSKIP("The remainder of this test requires nm");
+
+    QVERIFY2(nm.waitForFinished(), qPrintable(nm.errorString()));
+    QVERIFY2(nm.exitCode() == 0, nm.readAllStandardError().constData());
+    const QByteArray output = nm.readAllStandardOutput();
+    QVERIFY2(output.toLower().contains("debugginghelper"), output.constData());
 }
 
 void TestBlackboxQt::qobjectInObjectiveCpp()
@@ -611,10 +641,10 @@ void TestBlackboxQt::staticQtPluginLinking()
     QDir::setCurrent(testDataDir + "/static-qt-plugin-linking");
     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());
+    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());
+    QVERIFY2(!m_qbsStdout.contains("creating static import"), m_qbsStdout.constData());
 }
 
 void TestBlackboxQt::trackAddMocInclude()