Qbs: Build new resource file of Tiled Quick

Also made some other minor adjustments.
mapeditor · Apr 10, 2017 · a51b285 · a51b285
1 parent 879fb85
commit a51b285
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 24 deletions.
diff --git a/src/tiledquick/tiledquick.pro b/src/tiledquick/tiledquick.pro
@@ -13,14 +13,11 @@ macx {
 }
 
 SOURCES += main.cpp
-
-OTHER_FILES = main.qml
+RESOURCES += \
+    qml.qrc
 
 # Additional import path used to resolve QML modules in Qt Creator's code model
 QML_IMPORT_PATH =
 
 # Default rules for deployment.
 include(deployment.pri)
-
-RESOURCES += \
-    qml.qrc
diff --git a/src/tiledquick/tiledquick.qbs b/src/tiledquick/tiledquick.qbs
@@ -4,12 +4,10 @@ QtGuiApplication {
     name: "tiledquick"
     targetName: name
 
-    condition: Qt.core.versionMajor >= 5
-
-    Depends { name: "Qt.core" }     // for the Qt version check
     Depends {
-        condition: Qt.core.versionMajor >= 5
-        name: "Qt"; submodules: ["quick", "widgets"]
+        name: "Qt"
+        submodules: ["core", "quick", "widgets"]
+        versionAtLeast: "5.4"
     }
 
     cpp.includePaths: ["."]
@@ -18,6 +16,7 @@ QtGuiApplication {
 
     files: [
         "main.cpp",
+        "qml.qrc",
     ]
 
     Properties {
@@ -37,14 +36,4 @@ QtGuiApplication {
         }
         fileTagsFilter: product.type
     }
-
-    Group {
-        name: "QML files"
-        qbs.install: true
-        qbs.installDir: installBase + "qml/tiledquick"
-        files: [
-            "DragArea.qml",
-            "main.qml",
-        ]
-    }
 }
diff --git a/src/tiledquickplugin/tiledquickplugin.qbs b/src/tiledquickplugin/tiledquickplugin.qbs
@@ -3,13 +3,10 @@ import qbs 1.0
 DynamicLibrary {
     targetName: "tiledquickplugin"
 
-    condition: Qt.core.versionMajor >= 5
-
     Depends { name: "libtiled" }
-    Depends { name: "Qt.core" }     // for the Qt version check
     Depends {
-        condition: Qt.core.versionMajor >= 5
         name: "Qt"; submodules: ["qml", "quick"]
+        versionAtLeast: "5.4"
     }
 
     cpp.cxxLanguageVersion: "c++11"