aboutsummaryrefslogtreecommitdiffstats
path: root/qtcreator.pri
diff options
context:
space:
mode:
authorEike Ziller <eike.ziller@qt.io>2017-04-20 14:51:49 +0200
committerEike Ziller <eike.ziller@qt.io>2017-04-21 13:28:54 +0000
commit1891af4b07801e6cbab95aca77b2ef4979b46cc0 (patch)
tree5eaf1a82153a847e069d139f8903ae4dd14d7b49 /qtcreator.pri
parent0dfd08b00e4f4ee9300fffcb56aca546df26eb03 (diff)
Specify Qt Creator's "display version" in qtcreator.pri/qtc.qbs
Currently it is set by passing defines to qmake, which complicates package build setups. Set the display version where the numerical version is defined. This also makes it available to developer builds. Also switch around the display version and numerical version in the about dialog, since e.g. "4.3.0-rc1" is more descriptive than "4.2.83". Change-Id: I26dda427975acdc6cc169f8d625f57918167cf19 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io> Reviewed-by: Orgad Shaneh <orgads@gmail.com> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Diffstat (limited to 'qtcreator.pri')
-rw-r--r--qtcreator.pri1
1 files changed, 1 insertions, 0 deletions
diff --git a/qtcreator.pri b/qtcreator.pri
index 5bb7849892..64172d42d6 100644
--- a/qtcreator.pri
+++ b/qtcreator.pri
@@ -4,6 +4,7 @@ QTCREATOR_PRI_INCLUDED = 1
QTCREATOR_VERSION = 4.2.83
QTCREATOR_COMPAT_VERSION = 4.2.83
VERSION = $$QTCREATOR_VERSION
+QTCREATOR_DISPLAY_VERSION = 4.3.0-rc1
BINARY_ARTIFACTS_BRANCH = 4.3
CONFIG += c++14