diff options
| author | Christian Stenger <christian.stenger@qt.io> | 2019-06-03 09:12:57 +0200 |
|---|---|---|
| committer | Christian Stenger <christian.stenger@qt.io> | 2019-06-03 11:08:37 +0000 |
| commit | 884665a0fe2a9afe511e33601a421ead66d4c1b9 (patch) | |
| tree | e8631427de1b62d2c7fbb8ba72a41aba784cf13b /share/qtcreator/templates | |
| parent | 08025009a6b181c7cd525a3bb4b9ab8d3cb9a601 (diff) | |
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 <eike.ziller@qt.io>
Diffstat (limited to 'share/qtcreator/templates')
| -rw-r--r-- | share/qtcreator/templates/wizards/projects/cpplibrary/project.pro | 2 | ||||
| -rw-r--r-- | share/qtcreator/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 f6652ee930..431667ada5 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 ea455be4a2..ac43d6f1a9 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'))}" } |