diff options
| author | Orkun Tokdemir <orkun.tokdemir@qt.io> | 2024-12-13 17:40:14 +0100 |
|---|---|---|
| committer | Orkun Tokdemir <orkun.tokdemir@qt.io> | 2024-12-18 13:08:36 +0000 |
| commit | 2d706b23ce56288ccaf188b5a50aaa7222943ace (patch) | |
| tree | 0b002183915c0d41cf6053b2295072a3d7a3c36e | |
| parent | e69b51c7caa1e4f05ea4e7d98b1de7647d6dff73 (diff) | |
* Add `-DQT_QML_DEBUG` and `-DQT_DECLARATIVE_DEBUG` to
`CMAKE_CXX_FLAGS_DEBUG_INIT` and `CMAKE_CXX_FLAGS_RELWITHDEBINFO_INIT`
Task-number: VSCODEEXT-14
Change-Id: I9bb941b2fbfad737185def9726868bc2d9133cde
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
| -rw-r--r-- | qt-cpp/src/kit-manager.ts | 40 |
1 files changed, 18 insertions, 22 deletions
diff --git a/qt-cpp/src/kit-manager.ts b/qt-cpp/src/kit-manager.ts index 409aad8..18fd2d2 100644 --- a/qt-cpp/src/kit-manager.ts +++ b/qt-cpp/src/kit-manager.ts @@ -305,20 +305,27 @@ export class KitManager { } return kits; } - - private static *generateKitFromQtInfo(qtInfo: QtInfo, cmakeOnlyKits?: Kit[]) { + private static initKitWithCommonSettings() { const kit: Kit = { name: '', isTrusted: true, + preferredGenerator: { + name: CMakeDefaultGenerator + }, cmakeSettings: { - QT_QML_GENERATE_QMLLS_INI: 'ON' + QT_QML_GENERATE_QMLLS_INI: 'ON', + CMAKE_CXX_FLAGS_DEBUG_INIT: '-DQT_QML_DEBUG -DQT_DECLARATIVE_DEBUG', + CMAKE_CXX_FLAGS_RELWITHDEBINFO_INIT: + '-DQT_QML_DEBUG -DQT_DECLARATIVE_DEBUG' } }; + return kit; + } + + private static *generateKitFromQtInfo(qtInfo: QtInfo, cmakeOnlyKits?: Kit[]) { + const kit = KitManager.initKitWithCommonSettings(); const version = qtInfo.get('QT_VERSION'); kit.name = qtInfo.name ? qtInfo.name : generateDefaultQtPathsName(qtInfo); - kit.preferredGenerator = { - name: CMakeDefaultGenerator - }; const libs = qtInfo.get('QT_INSTALL_LIBS'); if (!libs) { return undefined; @@ -534,19 +541,11 @@ export class KitManager { } } const kitName = qtPath.mangleQtInstallation(qtInsRoot, installation); - let newKit: Kit = { - name: kitName, - environmentVariables: { - VSCODE_QT_INSTALLATION: installation, - PATH: qtPathEnv - }, - isTrusted: true, - preferredGenerator: { - name: CMakeDefaultGenerator - }, - cmakeSettings: { - QT_QML_GENERATE_QMLLS_INI: 'ON' - } + let newKit = KitManager.initKitWithCommonSettings(); + newKit.name = kitName; + newKit.environmentVariables = { + VSCODE_QT_INSTALLATION: installation, + PATH: qtPathEnv }; const toolchainFilePath = await promiseCmakeQtToolchainPath; @@ -578,9 +577,6 @@ export class KitManager { const mingwDirPath = await promiseMingwPath; logger.info(`Mingw dir path: ${mingwDirPath}`); if (mingwDirPath) { - if (newKit.environmentVariables == undefined) { - newKit.environmentVariables = {}; - } newKit.environmentVariables.PATH = [ newKit.environmentVariables.PATH, mingwDirPath |