diff options
author | Eike Ziller <eike.ziller@qt.io> | 2017-03-20 14:13:08 +0100 |
---|---|---|
committer | Eike Ziller <eike.ziller@qt.io> | 2017-03-22 08:20:39 +0000 |
commit | e035e8e1e8ba92098568c910c5ba099480418795 (patch) | |
tree | 8b152f19a48e12db398a53baa63fe90f7b32aba1 /packaging-tools/bld_qtcreator.py | |
parent | 10fe28e4b6ea423d92fe8eed951a0e4b7000e87e (diff) |
Qt Creator: Skip building wininterrupt 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: I60f6bd18abbfba3f5124da59fbdccaec3d025dcc
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 | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/packaging-tools/bld_qtcreator.py b/packaging-tools/bld_qtcreator.py index 3b563957e..f24e1f43c 100755 --- a/packaging-tools/bld_qtcreator.py +++ b/packaging-tools/bld_qtcreator.py @@ -253,7 +253,9 @@ if __name__ == "__main__": 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 + # skip compilation of cdbextension and wininterrupt, they are built separately below + qmakeCommandArguments += " QTC_SKIP_CDBEXT=1" + qmakeCommandArguments += " QTC_SKIP_WININTERRUPT=1" if callerArguments.versiondescription: qmakeCommandArguments += " DEFINES+=IDE_VERSION_DESCRIPTION={0}".format(callerArguments.versiondescription) |