Skip to content

GitLab

Commit 8864d053 authored by Eike Ziller's avatar Eike Ziller
Browse files
Options

Version bump 

Change-Id: I0c690e5010ade7f3ebbb4a94163d7b44da13c10d
parent 54bed745
Show whitespace changes
Inline Side-by-side
Showing with 6 additions and 6 deletions
qtcreator.pri
View file @ 8864d053
!isEmpty(QTCREATOR_PRI_INCLUDED):error("qtcreator.pri already included") !isEmpty(QTCREATOR_PRI_INCLUDED):error("qtcreator.pri already included")
QTCREATOR_PRI_INCLUDED = 1 QTCREATOR_PRI_INCLUDED = 1
QTCREATOR_VERSION = 3.0.84 QTCREATOR_VERSION = 3.1.0
QTCREATOR_COMPAT_VERSION = 3.0.84 QTCREATOR_COMPAT_VERSION = 3.1.0
BINARY_ARTIFACTS_BRANCH = 3.1 BINARY_ARTIFACTS_BRANCH = 3.1
# enable c++11 on everything but mac/release (breaks 10.6) # enable c++11 on everything but mac/release (breaks 10.6)
......
qtcreator.qbs
View file @ 8864d053
...@@ -3,12 +3,12 @@ import qbs 1.0 ...@@ -3,12 +3,12 @@ import qbs 1.0
Project { Project {
property bool withAutotests: qbs.buildVariant === "debug" property bool withAutotests: qbs.buildVariant === "debug"
property string ide_version_major: '3' property string ide_version_major: '3'
property string ide_version_minor: '0' property string ide_version_minor: '1'
property string ide_version_release: '84' property string ide_version_release: '0'
property string qtcreator_version: ide_version_major + '.' + ide_version_minor + '.' + ide_version_release property string qtcreator_version: ide_version_major + '.' + ide_version_minor + '.' + ide_version_release
property string ide_compat_version_major: '3' property string ide_compat_version_major: '3'
property string ide_compat_version_minor: '0' property string ide_compat_version_minor: '1'
property string ide_compat_version_release: '84' property string ide_compat_version_release: '0'
property string qtcreator_compat_version: ide_compat_version_major + '.' + ide_compat_version_minor + '.' + ide_compat_version_release property string qtcreator_compat_version: ide_compat_version_major + '.' + ide_compat_version_minor + '.' + ide_compat_version_release
property path ide_source_tree: path property path ide_source_tree: path
property string ide_app_path: qbs.targetOS.contains("osx") ? "" : "bin" property string ide_app_path: qbs.targetOS.contains("osx") ? "" : "bin"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment