diff --git a/bin/CraftSetupHelper.py b/bin/CraftSetupHelper.py --- a/bin/CraftSetupHelper.py +++ b/bin/CraftSetupHelper.py @@ -269,15 +269,6 @@ if not "HOME" in os.environ: self.addEnvVar("HOME", os.getenv("USERPROFILE")) - - if CraftCore.settings.getboolean("QtSDK", "Enabled", "false"): - sdkPath = os.path.join(CraftCore.settings.get("QtSDK", "Path"), - CraftCore.settings.get("QtSDK", "Version"), - CraftCore.settings.get("QtSDK", "Compiler"), "bin") - if not os.path.exists(sdkPath): - log(f"Please ensure that you have installed the Qt SDK in {sdkPath}", critical=True) - self.prependEnvVar("PATH", sdkPath) - if CraftCore.compiler.isMinGW(): if not CraftCore.settings.getboolean("QtSDK", "Enabled", "false"): if CraftCore.compiler.isX86(): @@ -321,6 +312,14 @@ CraftCore.settings.get("Paths", "CCACHE_DIR", os.path.join(CraftStandardDirs.craftRoot(), "build", "CCACHE"))) + if CraftCore.settings.getboolean("QtSDK", "Enabled", "false"): + sdkPath = os.path.join(CraftCore.settings.get("QtSDK", "Path"), + CraftCore.settings.get("QtSDK", "Version"), + CraftCore.settings.get("QtSDK", "Compiler"), "bin") + if not os.path.exists(sdkPath): + log(f"Please ensure that you have installed the Qt SDK in {sdkPath}", critical=True) + self.prependEnvVar("PATH", sdkPath) + if OsUtils.isWin(): self._setupWin() else: