diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2014-08-05 14:24:23 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2014-08-05 14:24:23 +0200 |
| commit | f3a61e8bf7f5b8275c000a0cac70b561422d2230 (patch) | |
| tree | 0cf0631a5b53fdab930f8a7936aff9c9c1c0952f /qtcreator.qbs | |
| parent | 59b34b6b539c78384ea3fc4fd018fe063b4ede53 (diff) | |
| parent | b2ac3fd90ccfc21cf4c5bce353d8e08208961eeb (diff) | |
Merge remote-tracking branch 'origin/3.2'
Conflicts:
qtcreator.pri
qtcreator.qbs
src/plugins/android/androidglobal.h
Change-Id: I3367bf2ea47c088989175dddeed2210294346f4c
Diffstat (limited to 'qtcreator.qbs')
| -rw-r--r-- | qtcreator.qbs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/qtcreator.qbs b/qtcreator.qbs index e0ee270736..7993328ffa 100644 --- a/qtcreator.qbs +++ b/qtcreator.qbs @@ -1,6 +1,7 @@ import qbs 1.0 Project { + minimumQbsVersion: "1.3" property bool withAutotests: qbs.buildVariant === "debug" property string ide_version_major: '3' property string ide_version_minor: '2' |