aboutsummaryrefslogtreecommitdiffstats
path: root/qt-cpp
diff options
context:
space:
mode:
Diffstat (limited to 'qt-cpp')
-rw-r--r--qt-cpp/src/kit-manager.ts5
-rw-r--r--qt-cpp/src/util/get-qt-paths.ts4
2 files changed, 2 insertions, 7 deletions
diff --git a/qt-cpp/src/kit-manager.ts b/qt-cpp/src/kit-manager.ts
index 6d402ad..59bdb1b 100644
--- a/qt-cpp/src/kit-manager.ts
+++ b/qt-cpp/src/kit-manager.ts
@@ -394,12 +394,11 @@ export class KitManager {
const promiseCmakeQtToolchainPath =
qtPath.locateCMakeQtToolchainFile(installation);
- const qtRootDir = qtPath.qtRootByQtInstallation(installation);
- const promiseMingwPath = qtPath.locateMingwBinDirPath(qtRootDir);
+ const promiseMingwPath = qtPath.locateMingwBinDirPath(qtInsRoot);
let qtPathEnv = KitManager.generateEnvPathForQtInstallation(installation);
let locatedNinjaExePath = '';
if (!commandExists.sync('ninja')) {
- const promiseNinjaExecutable = qtPath.locateNinjaExecutable(qtRootDir);
+ const promiseNinjaExecutable = qtPath.locateNinjaExecutable(qtInsRoot);
locatedNinjaExePath = await promiseNinjaExecutable;
}
if (locatedNinjaExePath) {
diff --git a/qt-cpp/src/util/get-qt-paths.ts b/qt-cpp/src/util/get-qt-paths.ts
index a61c941..9ebf15b 100644
--- a/qt-cpp/src/util/get-qt-paths.ts
+++ b/qt-cpp/src/util/get-qt-paths.ts
@@ -118,7 +118,3 @@ export async function locateCMakeQtToolchainFile(installation: string) {
return '';
}
-
-export function qtRootByQtInstallation(installation: string) {
- return path.normalize(path.join(installation, '..', '..'));
-}