diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2020-04-14 09:47:38 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2020-04-14 09:47:38 +0200 |
| commit | deb0eaf7950e4aa4067af730367e61cbd732d178 (patch) | |
| tree | 4c393e8a00b4e4ef3e2cdba9a99b755f59a6b8ba /cmake | |
| parent | e86a2bfdd2d3778456c828efbf1265804908815c (diff) | |
| parent | af061c81b7ea9e4b8e75ac63a2e172b5653f9037 (diff) | |
Merge remote-tracking branch 'origin/4.12'
Conflicts:
cmake/QtCreatorIDEBranding.cmake
qbs/modules/qtc/qtc.qbs
qtcreator_ide_branding.pri
src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp
Change-Id: I34c3d1fd5be90537e37d15e00b1a0d455d1bf81d
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/QtCreatorAPI.cmake | 1 | ||||
| -rw-r--r-- | cmake/QtCreatorIDEBranding.cmake | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/cmake/QtCreatorAPI.cmake b/cmake/QtCreatorAPI.cmake index 7dd104caf0..82f7897b6d 100644 --- a/cmake/QtCreatorAPI.cmake +++ b/cmake/QtCreatorAPI.cmake @@ -719,6 +719,7 @@ function(add_qtc_plugin target_name) string(REPLACE "$$QTCREATOR_VERSION" "\${IDE_VERSION}" plugin_json_in ${plugin_json_in}) string(REPLACE "$$QTCREATOR_COMPAT_VERSION" "\${IDE_VERSION_COMPAT}" plugin_json_in ${plugin_json_in}) string(REPLACE "$$QTCREATOR_COPYRIGHT_YEAR" "\${IDE_COPYRIGHT_YEAR}" plugin_json_in ${plugin_json_in}) + string(REPLACE "$$QTC_PLUGIN_REVISION" "\${QTC_PLUGIN_REVISION}" plugin_json_in ${plugin_json_in}) string(REPLACE "$$dependencyList" "\${IDE_PLUGIN_DEPENDENCY_STRING}" plugin_json_in ${plugin_json_in}) if(_arg_PLUGIN_JSON_IN) #e.g. UPDATEINFO_EXPERIMENTAL_STR=true diff --git a/cmake/QtCreatorIDEBranding.cmake b/cmake/QtCreatorIDEBranding.cmake index 4182c1c611..05f4a3fc77 100644 --- a/cmake/QtCreatorIDEBranding.cmake +++ b/cmake/QtCreatorIDEBranding.cmake @@ -3,7 +3,7 @@ set(IDE_VERSION "4.12.82") # The IDE version. set(IDE_VERSION_COMPAT "4.12.82") # The IDE Compatibility version. -set(IDE_VERSION_DISPLAY "4.13.0-beta1") # The IDE display version. +set(IDE_VERSION_DISPLAY "4.13.0-beta1") # The IDE display version. set(IDE_COPYRIGHT_YEAR "2020") # The IDE current copyright year. set(IDE_SETTINGSVARIANT "QtProject") # The IDE settings variation. |