From 8eb7c3efad1e16b677098e97c66daf0eabc672c7 Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Wed, 3 Jun 2015 17:07:29 +0200 Subject: Adapt to qbs' libexec infrastructure. Change-Id: Ic2d609e017d201b7b3e0b3bcb08359652428aeaa Reviewed-by: Joerg Bornemann --- qtcreator.qbs | 2 ++ 1 file changed, 2 insertions(+) (limited to 'qtcreator.qbs') diff --git a/qtcreator.qbs b/qtcreator.qbs index 012720bb11..ed18dbf37d 100644 --- a/qtcreator.qbs +++ b/qtcreator.qbs @@ -1,6 +1,7 @@ import qbs 1.0 Project { + name: "Qt Creator" minimumQbsVersion: "1.4" property bool withAutotests: qbs.buildVariant === "debug" property string ide_version_major: '3' @@ -56,6 +57,7 @@ Project { "QT_NO_CAST_FROM_ASCII" ].concat(testsEnabled ? ["WITH_TESTS"] : []) qbsSearchPaths: "qbs" + property bool enableQbsJavaSupport: false references: [ "src/src.qbs", -- cgit v1.2.1 From 52d89196bcb2e450829c0f4d80c4bdedbe7bb98f Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Mon, 15 Jun 2015 10:04:24 +0200 Subject: Version bump Change-Id: I4a9cde2300b1cc14feadaa6240fefebc57fd0e19 Reviewed-by: Eike Ziller --- qtcreator.qbs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'qtcreator.qbs') diff --git a/qtcreator.qbs b/qtcreator.qbs index ed18dbf37d..4d6d1f213b 100644 --- a/qtcreator.qbs +++ b/qtcreator.qbs @@ -6,7 +6,7 @@ Project { property bool withAutotests: qbs.buildVariant === "debug" property string ide_version_major: '3' property string ide_version_minor: '4' - property string ide_version_release: '1' + property string ide_version_release: '2' 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_minor: '4' -- cgit v1.2.1