Qt support: Add support for moc metatype files

From Qt 5.15 on, moc can generate metatype information in JSON format.

Task-number: QBS-1531
Change-Id: Ie6969f70bac51cc80f11057841ba8d4b7947c646
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>

7 files changed, 94 insertions, 0 deletions

diff --git a/tests/auto/blackbox/testdata-qt/metatypes/metatypes.qbs b/tests/auto/blackbox/testdata-qt/metatypes/metatypes.qbs
new file mode 100644
index 000000000..bbc98c934
--- /dev/null
+++ b/tests/auto/blackbox/testdata-qt/metatypes/metatypes.qbs
@@ -0,0 +1,28 @@
+import qbs.Utilities
+
+StaticLibrary {
+    name: "mylib"
+
+    Depends { name: "Qt.core" }
+
+    qbs.installPrefix: "some-prefix"
+
+    Probe {
+        id: capabilitiesChecker
+        property string version: Qt.core.version
+        configure: {
+            if (Utilities.versionCompare(version, "5.15") >= 0)
+                console.info("can generate");
+            else
+                console.info("cannot generate");
+            found = true;
+        }
+    }
+
+    files: [
+        "mocableclass1.cpp",
+        "mocableclass1.h",
+        "mocableclass2.cpp",
+        "unmocableclass.cpp",
+    ]
+}
diff --git a/tests/auto/blackbox/testdata-qt/metatypes/mocableclass1.cpp b/tests/auto/blackbox/testdata-qt/metatypes/mocableclass1.cpp
new file mode 100644
index 000000000..06adc8ca5
--- /dev/null
+++ b/tests/auto/blackbox/testdata-qt/metatypes/mocableclass1.cpp
@@ -0,0 +1,3 @@
+#include "mocableclass1.h"
+
+MocableClass1::MocableClass1(QObject *parent) : QObject(parent) {}
diff --git a/tests/auto/blackbox/testdata-qt/metatypes/mocableclass1.h b/tests/auto/blackbox/testdata-qt/metatypes/mocableclass1.h
new file mode 100644
index 000000000..020c15179
--- /dev/null
+++ b/tests/auto/blackbox/testdata-qt/metatypes/mocableclass1.h
@@ -0,0 +1,8 @@
+#include <QObject>
+
+class MocableClass1 : public QObject
+{
+    Q_OBJECT
+public:
+    MocableClass1(QObject *parent = nullptr);
+};
diff --git a/tests/auto/blackbox/testdata-qt/metatypes/mocableclass2.cpp b/tests/auto/blackbox/testdata-qt/metatypes/mocableclass2.cpp
new file mode 100644
index 000000000..bf538913a
--- /dev/null
+++ b/tests/auto/blackbox/testdata-qt/metatypes/mocableclass2.cpp
@@ -0,0 +1,10 @@
+#include <QObject>
+
+class MocableClass2 : public QObject
+{
+    Q_OBJECT
+public:
+    MocableClass2(QObject *parent) : QObject(parent) {}
+};
+
+#include <mocableclass2.moc>
diff --git a/tests/auto/blackbox/testdata-qt/metatypes/unmocableclass.cpp b/tests/auto/blackbox/testdata-qt/metatypes/unmocableclass.cpp
new file mode 100644
index 000000000..34330d189
--- /dev/null
+++ b/tests/auto/blackbox/testdata-qt/metatypes/unmocableclass.cpp
@@ -0,0 +1,7 @@
+#include <QObject>
+
+class UnmocableClass : public QObject
+{
+public:
+    UnmocableClass(QObject *parent) : QObject(parent) {}
+};
diff --git a/tests/auto/blackbox/tst_blackboxqt.cpp b/tests/auto/blackbox/tst_blackboxqt.cpp
index 132408820..a77676ea2 100644
--- a/tests/auto/blackbox/tst_blackboxqt.cpp
+++ b/tests/auto/blackbox/tst_blackboxqt.cpp
@@ -204,6 +204,42 @@ void TestBlackboxQt::lrelease()
     QVERIFY(!regularFileExists(relativeProductBuildDir("lrelease-test") + "/hu.qm"));
 }
 
+void TestBlackboxQt::metaTypes_data()
+{
+    QTest::addColumn<bool>("generate");
+    QTest::addColumn<QString>("installDir");
+    QTest::newRow("don't generate") << false << QString();
+    QTest::newRow("don't generate with install info") << false << QString("blubb");
+    QTest::newRow("generate only") << true << QString();
+    QTest::newRow("generate and install") << true << QString("blubb");
+}
+
+void TestBlackboxQt::metaTypes()
+{
+    QDir::setCurrent(testDataDir + "/metatypes");
+    QFETCH(bool, generate);
+    QFETCH(QString, installDir);
+    const QStringList args{"modules.Qt.core.generateMetaTypesFile:"
+                               + QString(generate ? "true" : "false"),
+                           "modules.Qt.core.metaTypesInstallDir:" + installDir,
+                           "-v", "--force-probe-execution"};
+    QCOMPARE(runQbs(QbsRunParameters("resolve", args)), 0);
+    const bool canGenerate = m_qbsStdout.contains("can generate");
+    const bool cannotGenerate = m_qbsStdout.contains("cannot generate");
+    QVERIFY(canGenerate != cannotGenerate);
+    const bool expectFiles = generate && canGenerate;
+    const bool expectInstalledFiles = expectFiles && !installDir.isEmpty();
+    QCOMPARE(runQbs(QStringList("--clean-install-root")), 0);
+    const QString productDir = relativeProductBuildDir("mylib");
+    const QString outputDir =  productDir + "/qt.headers";
+    QVERIFY(!regularFileExists(outputDir + "/moc_unmocableclass.cpp.json"));
+    QCOMPARE(regularFileExists(outputDir + "/moc_mocableclass1.cpp.json"), expectFiles);
+    QCOMPARE(regularFileExists(outputDir + "/mocableclass2.moc.json"), expectFiles);
+    QCOMPARE(regularFileExists(productDir + "/mylib_metatypes.json"), expectFiles);
+    QCOMPARE(regularFileExists(relativeBuildDir() + "/install-root/some-prefix/" + installDir
+                               + "/mylib_metatypes.json"), expectInstalledFiles);
+}
+
 void TestBlackboxQt::mixedBuildVariants()
 {
     QDir::setCurrent(testDataDir + "/mixed-build-variants");
diff --git a/tests/auto/blackbox/tst_blackboxqt.h b/tests/auto/blackbox/tst_blackboxqt.h
index 180f9e0c0..150bcc4b7 100644
--- a/tests/auto/blackbox/tst_blackboxqt.h
+++ b/tests/auto/blackbox/tst_blackboxqt.h
@@ -53,6 +53,8 @@ private slots:
     void includedMocCpp();
     void linkerVariant();
     void lrelease();
+    void metaTypes_data();
+    void metaTypes();
     void mixedBuildVariants();
     void mocAndCppCombining();
     void mocFlags();