diff options
| author | Eike Ziller <eike.ziller@digia.com> | 2012-09-19 18:02:46 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@digia.com> | 2012-09-19 18:02:46 +0200 |
| commit | b947861c59abc087af2af06f208d5ee0646724c4 (patch) | |
| tree | 72942f37b361dd6fc5f6ae2ec99c37903c254362 /qbs | |
| parent | c0321ac305b8768eab1061c14ab83af0a3796f98 (diff) | |
| parent | 44177392ec332fd55e96f52c27b4c4c6ec0011bd (diff) | |
Merge remote-tracking branch 'origin/2.6'
Conflicts:
qtcreator.qbp
src/libs/QtcLibrary.qbs
src/plugins/QtcPlugin.qbs
src/tools/QtcTool.qbs
Change-Id: I3acea26888febe8f96d2131932266ed88b9f55f5
Diffstat (limited to 'qbs')
| -rw-r--r-- | qbs/defaults.js | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/qbs/defaults.js b/qbs/defaults.js index 1b835f6928..7c11a2c0ad 100644 --- a/qbs/defaults.js +++ b/qbs/defaults.js @@ -5,7 +5,10 @@ function testsEnabled(qbs) function defines(qbs) { - var list = [ 'IDE_LIBRARY_BASENAME="lib"' ] + var list = [ + 'IDE_LIBRARY_BASENAME="lib"', + "QT_DISABLE_DEPRECATED_BEFORE=0x040900" + ] if (testsEnabled(qbs)) list.push("WITH_TESTS") return list |