diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2020-03-20 08:16:19 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2020-03-20 08:16:19 +0100 |
| commit | d80f3972a4efe996f3df6d27d689ea2646c1d9bb (patch) | |
| tree | ab121c7ca074bea4aee3acc5395f336799969727 /cmake | |
| parent | 5de0e81d8bd2da30ce20f802c1e4922662f17473 (diff) | |
| parent | 7f0b418a2295996142488dfb24b3eef1285f7cd9 (diff) | |
Merge remote-tracking branch 'origin/4.12'
Change-Id: Ia8254720b2ba6e3e7b859017e1c2b6e289bed771
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/QtCreatorIDEBranding.cmake | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cmake/QtCreatorIDEBranding.cmake b/cmake/QtCreatorIDEBranding.cmake index 8f1bd0fb0e..402acabfb8 100644 --- a/cmake/QtCreatorIDEBranding.cmake +++ b/cmake/QtCreatorIDEBranding.cmake @@ -1,9 +1,9 @@ #BINARY_ARTIFACTS_BRANCH = master #PROJECT_USER_FILE_EXTENSION = .user -set(IDE_VERSION "4.11.83") # The IDE version. -set(IDE_VERSION_COMPAT "4.11.83") # The IDE Compatibility version. -set(IDE_VERSION_DISPLAY "4.12.0-beta2") # The IDE display version. +set(IDE_VERSION "4.11.84") # The IDE version. +set(IDE_VERSION_COMPAT "4.11.84") # The IDE Compatibility version. +set(IDE_VERSION_DISPLAY "4.12.0-rc1") # The IDE display version. set(IDE_COPYRIGHT_YEAR "2020") # The IDE current copyright year. set(IDE_SETTINGSVARIANT "QtProject") # The IDE settings variation. |