Merge branch 'master' into file_dialog

mapeditor · Jul 28, 2023 · 4adeb81 · 4adeb81
2 parents d73ce75 + a1de722
commit 4adeb81
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 8 deletions.
diff --git a/.github/workflows/packages.yml b/.github/workflows/packages.yml
@@ -15,7 +15,7 @@ on:
     - '.travis.yml'
 
 env:
-  QBS_VERSION: 1.23.1
+  QBS_VERSION: 2.0.2
   SENTRY_VERSION: 0.6.4
   SENTRY_ORG: mapeditor
   SENTRY_PROJECT: tiled
@@ -54,7 +54,7 @@ jobs:
     env:
       TILED_VERSION: ${{ needs.version.outputs.version }}
       QT_VERSION: ${{ matrix.qt_version }}
-      QTCREATOR_VERSION: 9.0.1
+      QTCREATOR_VERSION: 10.0.2
 
     steps:
     - name: Checkout repository
@@ -191,17 +191,15 @@ jobs:
         include:
         - qt_version: 5.12.12
           version_suffix: "10.12-10.13"
-          qt_creator_version: 5.0.3
           architectures: x86_64
         - qt_version: 6.5.0
           version_suffix: "10.14+"
-          qt_creator_version: 7.0.2
           architectures: x86_64,arm64
 
     env:
       TILED_VERSION: ${{ needs.version.outputs.version }}
       QT_VERSION: ${{ matrix.qt_version }}
-      QTCREATOR_VERSION: ${{ matrix.qt_creator_version }}
+      QTCREATOR_VERSION: 10.0.2
 
     steps:
     - name: Checkout repository

diff --git a/appveyor.yml b/appveyor.yml
@@ -35,7 +35,7 @@ environment:
 configuration: Release
 
 install:
-  - choco install -y qbs --version 1.21.0
+  - choco install -y qbs --version 2.0.2
   - nuget install secure-file -ExcludeVersion
   - set PATH=%PATH%;%QTDIR%\bin;%MINGW%\bin
 

diff --git a/dist/win/installer.qbs b/dist/win/installer.qbs
@@ -54,7 +54,8 @@ WindowsInstallerPackage {
 
         defs.push("WindowsVistaStyle")
 
-        if (File.exists(Environment.getEnv("PYTHONHOME")))
+        var pythonHome = Environment.getEnv("PYTHONHOME");
+        if (pythonHome && File.exists(pythonHome))
             defs.push("Python");
 
         var rpMapEnabled = !qbs.toolchain.contains("msvc")

diff --git a/src/plugins/python/python.qbs b/src/plugins/python/python.qbs
@@ -8,7 +8,7 @@ TiledPlugin {
 
     condition: {
         if (qbs.targetOS.contains("windows"))
-            return File.exists(Environment.getEnv("PYTHONHOME"));
+            return pythonDllProbe.found;
 
         return pkgConfigPython3Embed.found || pkgConfigPython3.found;
     }