Qbs: Increased minimum version to Qbs 1.13

bjorn · bjorn · commit bca8635d360e · 2023-03-16T11:43:39.000+01:00
Removed no longer necessary base module imports.
diff --git a/dist/archive.qbs b/dist/archive.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 InstallPackage {
     builtByDefault: project.snapshot || project.release
     condition: {
diff --git a/dist/distribute.qbs b/dist/distribute.qbs
@@ -3,7 +3,6 @@
   shipped when Tiled is distributed.
 */
 
-import qbs
 import qbs.File
 import qbs.FileInfo
 
diff --git a/dist/win/installer.qbs b/dist/win/installer.qbs
@@ -1,4 +1,3 @@
-import qbs
 import qbs.FileInfo
 import qbs.File
 import qbs.TextFile
diff --git a/docs/docs.qbs b/docs/docs.qbs
@@ -1,5 +1,3 @@
-import qbs 1.0
-
 Product {
     files: [
         "conf.py",
diff --git a/qbs/imports/PythonProbe.qbs b/qbs/imports/PythonProbe.qbs
@@ -1,4 +1,3 @@
-import qbs
 import qbs.Environment
 import qbs.File
 import qbs.FileInfo
diff --git a/qbs/imports/TiledPlugin.qbs b/qbs/imports/TiledPlugin.qbs
@@ -1,5 +1,3 @@
-import qbs 1.0
-
 DynamicLibrary {
     Depends { name: "libtiled" }
     Depends { name: "cpp" }
diff --git a/qbs/imports/TiledQtGuiApplication.qbs b/qbs/imports/TiledQtGuiApplication.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 QtGuiApplication {
     cpp.useRPaths: project.useRPaths
     cpp.rpaths: {
diff --git a/qbs/imports/TiledTest.qbs b/qbs/imports/TiledTest.qbs
@@ -1,4 +1,3 @@
-import qbs
 import qbs.FileInfo
 
 CppApplication {
diff --git a/src/karchive/karchive.qbs b/src/karchive/karchive.qbs
@@ -1,5 +1,3 @@
-import qbs 1.0
-
 StaticLibrary {
     condition: !qbs.toolchain.contains("msvc")
 
diff --git a/src/libtiled/libtiled.qbs b/src/libtiled/libtiled.qbs
@@ -1,4 +1,3 @@
-import qbs 1.0
 import qbs.Probes as Probes
 
 DynamicLibrary {
diff --git a/src/libtiledquick/libtiledquick.qbs b/src/libtiledquick/libtiledquick.qbs
@@ -1,5 +1,3 @@
-import qbs 1.0
-
 DynamicLibrary {
     targetName: "tiledquick"
     builtByDefault: false
diff --git a/src/plugins/csv/csv.qbs b/src/plugins/csv/csv.qbs
@@ -1,5 +1,3 @@
-import qbs 1.0
-
 TiledPlugin {
     cpp.defines: base.concat(["CSV_LIBRARY"])
 
diff --git a/src/plugins/defold/defold.qbs b/src/plugins/defold/defold.qbs
@@ -1,5 +1,3 @@
-import qbs 1.0
-
 TiledPlugin {
     cpp.defines: base.concat(["DEFOLD_LIBRARY"])
 
diff --git a/src/plugins/defoldcollection/defoldcollection.qbs b/src/plugins/defoldcollection/defoldcollection.qbs
@@ -1,5 +1,3 @@
-import qbs 1.0
-
 TiledPlugin {
     cpp.defines: base.concat(["DEFOLDCOLLECTION_LIBRARY"])
 
diff --git a/src/plugins/droidcraft/droidcraft.qbs b/src/plugins/droidcraft/droidcraft.qbs
@@ -1,5 +1,3 @@
-import qbs 1.0
-
 TiledPlugin {
     cpp.defines: base.concat(["DROIDCRAFT_LIBRARY"])
 
diff --git a/src/plugins/flare/flare.qbs b/src/plugins/flare/flare.qbs
@@ -1,5 +1,3 @@
-import qbs 1.0
-
 TiledPlugin {
     cpp.defines: base.concat(["FLARE_LIBRARY"])
 
diff --git a/src/plugins/gmx/gmx.qbs b/src/plugins/gmx/gmx.qbs
@@ -1,5 +1,3 @@
-import qbs 1.0
-
 TiledPlugin {
     cpp.defines: base.concat(["GMX_LIBRARY"])
 
diff --git a/src/plugins/json/json.qbs b/src/plugins/json/json.qbs
@@ -1,5 +1,3 @@
-import qbs 1.0
-
 TiledPlugin {
     cpp.defines: base.concat(["JSON_LIBRARY"])
 
diff --git a/src/plugins/json1/json1.qbs b/src/plugins/json1/json1.qbs
@@ -1,5 +1,3 @@
-import qbs 1.0
-
 TiledPlugin {
     cpp.defines: base.concat(["JSON_LIBRARY"])
 
diff --git a/src/plugins/lua/lua.qbs b/src/plugins/lua/lua.qbs
@@ -1,5 +1,3 @@
-import qbs 1.0
-
 TiledPlugin {
     cpp.defines: base.concat(["LUA_LIBRARY"])
 
diff --git a/src/plugins/python/python.qbs b/src/plugins/python/python.qbs
@@ -1,4 +1,3 @@
-import qbs 1.0
 import qbs.Probes as Probes
 import qbs.File
 import qbs.Environment
diff --git a/src/plugins/replicaisland/replicaisland.qbs b/src/plugins/replicaisland/replicaisland.qbs
@@ -1,5 +1,3 @@
-import qbs 1.0
-
 TiledPlugin {
     cpp.defines: base.concat(["REPLICAISLAND_LIBRARY"])
 
diff --git a/src/plugins/rpmap/rpmap.qbs b/src/plugins/rpmap/rpmap.qbs
@@ -1,5 +1,3 @@
-import qbs 1.0
-
 TiledPlugin {
     condition: !qbs.toolchain.contains("msvc")
 
diff --git a/src/plugins/tbin/tbin.qbs b/src/plugins/tbin/tbin.qbs
@@ -1,5 +1,3 @@
-import qbs 1.0
-
 TiledPlugin {
     cpp.defines: base.concat(["TBIN_LIBRARY"])
 
diff --git a/src/plugins/tengine/tengine.qbs b/src/plugins/tengine/tengine.qbs
@@ -1,5 +1,3 @@
-import qbs 1.0
-
 TiledPlugin {
     cpp.defines: base.concat(["TENGINE_LIBRARY"])
 
diff --git a/src/plugins/tscn/tscn.qbs b/src/plugins/tscn/tscn.qbs
@@ -1,5 +1,3 @@
-import qbs 1.0
-
 TiledPlugin {
     cpp.defines: base.concat(["TSCN_LIBRARY"])
 
diff --git a/src/plugins/yy/yy.qbs b/src/plugins/yy/yy.qbs
@@ -1,5 +1,3 @@
-import qbs 1.0
-
 TiledPlugin {
     cpp.defines: base.concat(["YY_LIBRARY"])
 
diff --git a/src/qtpropertybrowser/qtpropertybrowser.qbs b/src/qtpropertybrowser/qtpropertybrowser.qbs
@@ -1,5 +1,3 @@
-import qbs 1.0
-
 StaticLibrary {
     name: "qtpropertybrowser"
 
diff --git a/src/qtsingleapplication/qtsingleapplication.qbs b/src/qtsingleapplication/qtsingleapplication.qbs
@@ -1,5 +1,3 @@
-import qbs 1.0
-
 StaticLibrary {
     name: "qtsingleapplication"
 
diff --git a/src/terraingenerator/terraingenerator.qbs b/src/terraingenerator/terraingenerator.qbs
@@ -1,5 +1,3 @@
-import qbs 1.0
-
 TiledQtGuiApplication {
     name: "terraingenerator"
 
diff --git a/src/tiled/libtilededitor.qbs b/src/tiled/libtilededitor.qbs
@@ -1,4 +1,3 @@
-import qbs 1.0
 import qbs.File
 import qbs.FileInfo
 import qbs.TextFile
diff --git a/src/tiledapp/tiledapp.qbs b/src/tiledapp/tiledapp.qbs
@@ -1,4 +1,3 @@
-import qbs 1.0
 import qbs.File
 import qbs.FileInfo
 import qbs.TextFile
diff --git a/src/tiledquick/tiledquick.qbs b/src/tiledquick/tiledquick.qbs
@@ -1,4 +1,3 @@
-import qbs 1.0
 import qbs.Environment
 import qbs.File
 
diff --git a/src/tiledquickplugin/tiledquickplugin.qbs b/src/tiledquickplugin/tiledquickplugin.qbs
@@ -1,5 +1,3 @@
-import qbs 1.0
-
 DynamicLibrary {
     targetName: "tiledquickplugin"
     builtByDefault: false
diff --git a/src/tmxrasterizer/tmxrasterizer.qbs b/src/tmxrasterizer/tmxrasterizer.qbs
@@ -1,5 +1,3 @@
-import qbs 1.0
-
 TiledQtGuiApplication {
     name: "tmxrasterizer"
 
diff --git a/src/tmxviewer/tmxviewer.qbs b/src/tmxviewer/tmxviewer.qbs
@@ -1,5 +1,3 @@
-import qbs 1.0
-
 TiledQtGuiApplication {
     name: "tmxviewer"
 
diff --git a/tests/automapping/automapping.qbs b/tests/automapping/automapping.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 TiledTest {
     name: "test_automapping"
 
diff --git a/tests/mapreader/mapreader.qbs b/tests/mapreader/mapreader.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 TiledTest {
     name: "test_mapreader"
 
diff --git a/tests/properties/properties.qbs b/tests/properties/properties.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 TiledTest {
     name: "test_properties"
 
diff --git a/tests/staggeredrenderer/staggeredrenderer.qbs b/tests/staggeredrenderer/staggeredrenderer.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 TiledTest {
     name: "test_staggeredrenderer"
 
diff --git a/tests/tests.qbs b/tests/tests.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Project {
     name: "tests"
 
diff --git a/tiled.qbs b/tiled.qbs
@@ -1,11 +1,10 @@
-import qbs 1.0
 import qbs.Environment
 
 Project {
     name: "Tiled"
 
     qbsSearchPaths: "qbs"
-    minimumQbsVersion: "1.12"
+    minimumQbsVersion: "1.13"
 
     property string version: Environment.getEnv("TILED_VERSION") || "1.10.0";
     property bool snapshot: Environment.getEnv("TILED_SNAPSHOT") == "true"
diff --git a/translations/translations.qbs b/translations/translations.qbs
@@ -1,5 +1,3 @@
-import qbs 1.0
-
 Product {
     name: "translations"
     type: "qm"

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-import qbs`
`2`		`-`
`3`	`1`	`InstallPackage {`
`4`	`2`	`builtByDefault: project.snapshot \|\| project.release`
`5`	`3`	`condition: {`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-import qbs`
`2`	`1`	`import qbs.FileInfo`
`3`	`2`	`import qbs.File`
`4`	`3`	`import qbs.TextFile`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-import qbs 1.0`
`2`		`-`
`3`	`1`	`Product {`
`4`	`2`	`files: [`
`5`	`3`	`"conf.py",`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-import qbs`
`2`	`1`	`import qbs.Environment`
`3`	`2`	`import qbs.File`
`4`	`3`	`import qbs.FileInfo`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-import qbs 1.0`
`2`		`-`
`3`	`1`	`DynamicLibrary {`
`4`	`2`	`Depends { name: "libtiled" }`
`5`	`3`	`Depends { name: "cpp" }`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-import qbs`
`2`		`-`
`3`	`1`	`QtGuiApplication {`
`4`	`2`	`cpp.useRPaths: project.useRPaths`
`5`	`3`	`cpp.rpaths: {`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-import qbs 1.0`
`2`		`-`
`3`	`1`	`StaticLibrary {`
`4`	`2`	`condition: !qbs.toolchain.contains("msvc")`
`5`	`3`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-import qbs 1.0`
`2`	`1`	`import qbs.Probes as Probes`
`3`	`2`
`4`	`3`	`DynamicLibrary {`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-import qbs 1.0`
`2`		`-`
`3`	`1`	`TiledPlugin {`
`4`	`2`	`cpp.defines: base.concat(["CSV_LIBRARY"])`
`5`	`3`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-import qbs 1.0`
`2`		`-`
`3`	`1`	`TiledQtGuiApplication {`
`4`	`2`	`name: "terraingenerator"`
`5`	`3`