Merge branch '1.18'

Change-Id: I4e437865514add88558f66420718bc02fb39e41d

1 files changed, 7 insertions, 0 deletions

diff --git a/tests/auto/blackbox/testdata-qt/plugin-meta-data/plugin-meta-data.qbs b/tests/auto/blackbox/testdata-qt/plugin-meta-data/plugin-meta-data.qbs
index 7fb477575..7e5f98340 100644
--- a/tests/auto/blackbox/testdata-qt/plugin-meta-data/plugin-meta-data.qbs
+++ b/tests/auto/blackbox/testdata-qt/plugin-meta-data/plugin-meta-data.qbs
@@ -1,6 +1,13 @@
+import qbs.Utilities
+
 Project {
     QtApplication {
         condition: {
+            if (Utilities.versionCompare(Qt.core.version, "5.0") < 0) {
+                // qt4 moc can't be used with pluginMetaData
+                console.info("using qt4");
+                return false;
+            }
             var result = qbs.targetPlatform === qbs.hostPlatform;
             if (!result)
                 console.info("targetPlatform differs from hostPlatform");