From 884665a0fe2a9afe511e33601a421ead66d4c1b9 Mon Sep 17 00:00:00 2001 From: Christian Stenger Date: Mon, 3 Jun 2019 09:12:57 +0200 Subject: [PATCH] Wizards: Fix CppLibrary wizards Fix wrong string evaluation of boolean values which made in turn the generated files partially wrong. Introduced with cb63706f83610 (but wrong also before for the no-Qt-dependency case). Change-Id: I404534d4b21d0d1c496635adfcd8a73716ba13d3 Reviewed-by: Eike Ziller --- .../templates/wizards/projects/cpplibrary/project.pro | 2 +- .../templates/wizards/projects/cpplibrary/wizard.json | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/share/qtcreator/templates/wizards/projects/cpplibrary/project.pro b/share/qtcreator/templates/wizards/projects/cpplibrary/project.pro index f6652ee9301..431667ada5b 100644 --- a/share/qtcreator/templates/wizards/projects/cpplibrary/project.pro +++ b/share/qtcreator/templates/wizards/projects/cpplibrary/project.pro @@ -1,5 +1,5 @@ @if '%{QtModule}' === 'none' -QT -= core +CONFIG -= qt @elsif '%{QtModule}' === 'core' QT -= gui @else diff --git a/share/qtcreator/templates/wizards/projects/cpplibrary/wizard.json b/share/qtcreator/templates/wizards/projects/cpplibrary/wizard.json index ea455be4a2d..ac43d6f1a9f 100644 --- a/share/qtcreator/templates/wizards/projects/cpplibrary/wizard.json +++ b/share/qtcreator/templates/wizards/projects/cpplibrary/wizard.json @@ -23,12 +23,12 @@ { "key": "PluginInterface", "value": "%{JS: value('BaseClassInfo').PluginInterface }" }, { "key": "PluginModule", "value": "%{JS: value('BaseClassInfo').PluginModule }" }, { "key": "PluginMethods", "value": "%{JS: value('BaseClassInfo').PluginMethods }" }, - { "key": "QtModule", "value": "%{JS: value('IsQtPlugin') ? value('PluginModule') : value('LibraryQtModule')}" }, + { "key": "QtModule", "value": "%{JS: value('IsQtPlugin') === 'true' ? value('PluginModule') : value('LibraryQtModule')}" }, { "key": "QtModuleUpperCase", "value": "%{JS: value('QtModule').charAt(0).toUpperCase() + value('QtModule').slice(1)}" }, { "key": "LibraryDefine", "value": "%{JS: Cpp.headerGuard(value('ProjectName')) + '_LIBRARY'}" }, { "key": "LibraryExport", "value": "%{JS: Cpp.headerGuard(value('ProjectName')) + '_EXPORT'}" }, { "key": "GlobalHdrFileName", "value": "%{JS: Util.fileName(value('ProjectName') + '_global', Util.preferredSuffix('text/x-c++hdr'))}" }, - { "key": "TargetInstallPath", "value": "%{JS: value('IsShared') ? '/usr/lib' : (value('IsQtPlugin') && value('PluginTargetPath') ? '$$[QT_INSTALL_PLUGINS]/' + value('PluginTargetPath') : '')}" }, + { "key": "TargetInstallPath", "value": "%{JS: value('IsShared') === 'true' ? '/usr/lib' : (value('IsQtPlugin') && value('PluginTargetPath') ? '$$[QT_INSTALL_PLUGINS]/' + value('PluginTargetPath') : '')}" }, { "key": "CN", "value": "%{JS: Cpp.className(value('Class'))}" }, { "key": "GUARD", "value": "%{JS: Cpp.headerGuard(value('HdrFileName'))}" }, { "key": "GLOBAL_GUARD", "value": "%{JS: Cpp.headerGuard(value('GlobalHdrFileName'))}" }