remove qmake files for the new project and conditionally compile rpma…

…p plugin This makes building rpmap plugin depend on projects.Tiled.enableKArchive:true
mapeditor · Oct 28, 2020 · 33fa108 · 33fa108
1 parent 938dacb
commit 33fa108
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 23 deletions.
diff --git a/src/plugins/plugins.pro b/src/plugins/plugins.pro
@@ -9,7 +9,6 @@ SUBDIRS = csv \
           json1 \
           lua \
           replicaisland \
-          rpmap \
           tbin \
           tengine
 

diff --git a/src/plugins/plugins.qbs b/src/plugins/plugins.qbs
@@ -1,6 +1,13 @@
 Project {
     name: "plugins"
 
+    SubProject {
+        filePath: "rpmap/rpmap.qbs"
+        Properties {
+            condition: parent.enableKArchive
+        }
+    }
+
     references: [
         "csv",
         "defold",
@@ -13,7 +20,6 @@ Project {
         "lua",
         "python",
         "replicaisland",
-        "rpmap",
         "tbin",
         "tengine"
     ]

diff --git a/src/plugins/rpmap/rpmap.pro b/src/plugins/rpmap/rpmap.pro
diff --git a/tiled.qbs b/tiled.qbs
@@ -14,6 +14,7 @@ Project {
     property bool useRPaths: true
     property bool windowsInstaller: false
     property bool enableZstd: false
+    property bool enableKArchive: false
 
     references: [
         "dist/archive.qbs",
-Original file line number
+Diff line change
@@ Expand Up / @@ -9,7 +9,6 @@ SUBDIRS = csv \ @@
               json1 \
               lua \
               replicaisland \
-              rpmap \
               tbin \
               tengine
@@ Expand Down @@