summaryrefslogtreecommitdiff
path: root/cmake
diff options
context:
space:
mode:
authorEike Ziller <eike.ziller@qt.io>2019-11-04 14:41:36 +0100
committerEike Ziller <eike.ziller@qt.io>2019-11-04 14:41:36 +0100
commit04f0123c43ab602880da3fd41c9f650882ac39b6 (patch)
tree3c9d289b3d10285dc9e164cdf6a8232f656d7036 /cmake
parent03a52b9c8725992408f0087294ab1bc5be9159e6 (diff)
parent5ece12d4ea9291f1063b9c7ec71fb9764537cfdb (diff)
downloadqt-creator-04f0123c43ab602880da3fd41c9f650882ac39b6.tar.gz
Merge remote-tracking branch 'origin/4.11'
Change-Id: Ie951c531a5b2efd8e6b972c4d04b7f1c681c8ef9
Diffstat (limited to 'cmake')
-rw-r--r--cmake/QtCreatorIDEBranding.cmake6
1 files changed, 3 insertions, 3 deletions
diff --git a/cmake/QtCreatorIDEBranding.cmake b/cmake/QtCreatorIDEBranding.cmake
index 172f2e6dcf..bdf9594e14 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.10.83") # The IDE version.
-set(IDE_VERSION_COMPAT "4.10.83") # The IDE Compatibility version.
-set(IDE_VERSION_DISPLAY "4.11.0-beta2") # The IDE display version.
+set(IDE_VERSION "4.10.84") # The IDE version.
+set(IDE_VERSION_COMPAT "4.10.84") # The IDE Compatibility version.
+set(IDE_VERSION_DISPLAY "4.11.0-rc1") # The IDE display version.
set(IDE_COPYRIGHT_YEAR "2019") # The IDE current copyright year.
set(IDE_SETTINGSVARIANT "QtProject") # The IDE settings variation.