diff options
| author | Orkun Tokdemir <orkun.tokdemir@qt.io> | 2024-09-25 16:52:30 +0200 |
|---|---|---|
| committer | Orkun Tokdemir <orkun.tokdemir@qt.io> | 2024-09-27 13:36:39 +0000 |
| commit | 5dc45bcc162dbf9debadb43933a53e9ecda0cd04 (patch) | |
| tree | 512cd81a2de4dcaae8341d63e474afa4174d1080 /qt-cpp | |
| parent | d2e7b3cc9a5d4f34fab4dc9796a6455ff90fcda6 (diff) | |
qt-cpp: Remove unused code
Change-Id: I0c9accb3577b4e9bafdaa2df5f3f1fbb7b51fb60
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
Diffstat (limited to 'qt-cpp')
| -rw-r--r-- | qt-cpp/src/kit-manager.ts | 5 | ||||
| -rw-r--r-- | qt-cpp/src/util/get-qt-paths.ts | 4 |
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, '..', '..')); -} |