diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2017-03-16 15:29:59 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2017-03-20 08:22:43 +0000 |
| commit | 9706fa2b8ccf2ff31e328e92dac652d9db007ff5 (patch) | |
| tree | 73ada6ac1248755fdf56417451576c25f9191c00 /packaging-tools/bld_qtcreator.py | |
| parent | d2c5f529bc3978b3035a7f70a695649186873b70 (diff) | |
Qt Creator: Skip building cdbextension for Qt Creator 4.3 and later
Qt Creator 4.2 still needs it and also doesn't handle the qmake
variable, so we can set it unconditionally
Change-Id: I6a47a7e90be3b1f4a61dec05f1894f26f3c8fc1c
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
Reviewed-by: David Schulz <david.schulz@qt.io>
Diffstat (limited to 'packaging-tools/bld_qtcreator.py')
| -rwxr-xr-x | packaging-tools/bld_qtcreator.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/packaging-tools/bld_qtcreator.py b/packaging-tools/bld_qtcreator.py index 1782f27c2..3b563957e 100755 --- a/packaging-tools/bld_qtcreator.py +++ b/packaging-tools/bld_qtcreator.py @@ -251,8 +251,9 @@ if __name__ == "__main__": if bldinstallercommon.is_mac_platform(): qmakeCommandArguments += " QMAKE_MAC_SDK=macosx" # work around QTBUG-41238 - if sys.platform == "win32": # allow app to run on Windows XP + if bldinstallercommon.is_win_platform(): # allow app to run on Windows XP qmakeCommandArguments += " QMAKE_LFLAGS_WINDOWS=/SUBSYSTEM:WINDOWS,5.01" + qmakeCommandArguments += " QTC_SKIP_CDBEXT=1" # skip compilation of cdbextension, it is built separately below if callerArguments.versiondescription: qmakeCommandArguments += " DEFINES+=IDE_VERSION_DESCRIPTION={0}".format(callerArguments.versiondescription) |