diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2020-05-25 10:10:01 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2020-05-26 06:35:45 +0000 |
| commit | 63df649655a857599cc14dbe29a3e1647d927fb9 (patch) | |
| tree | 3a5c69db4518436e53463e3cd17294f19415d266 /qtcreator.pro | |
| parent | bb418d2769e2025525f8ae05149b719fca4122b7 (diff) | |
Packaging: Get rid of binary-artifacts repository usage
We removed the cdbextension and wininterrupt binaries from there a long time
ago, and instead package these for the installer. Package newest jom version
from its actual release in the installer as well.
Task-number: QTCREATORBUG-23908
Change-Id: Ic9bdc97774cbeb894fc261e57af127d6cdc71205
Reviewed-by: Antti Kokko <antti.kokko@qt.io>
Diffstat (limited to 'qtcreator.pro')
| -rw-r--r-- | qtcreator.pro | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/qtcreator.pro b/qtcreator.pro index 02392bc9de..a8cb39fac3 100644 --- a/qtcreator.pro +++ b/qtcreator.pro @@ -124,14 +124,8 @@ macx { BINDIST_EXCLUDE_ARG.debug = $${BINDIST_EXCLUDE_ARG.release} deployqt.commands = python -u $$PWD/scripts/deployqt.py -i \"$(INSTALL_ROOT)$$QTC_PREFIX/bin/$${IDE_APP_TARGET}\" \"$(QMAKE)\" deployqt.depends = install - win32:!isEmpty(BINARY_ARTIFACTS_BRANCH) { - deployartifacts.depends = install - deployartifacts.commands = git clone --depth 1 -b $$BINARY_ARTIFACTS_BRANCH \ - "http://code.qt.io/qt-creator/binary-artifacts.git" \ - && xcopy /s /q /y /i "binary-artifacts\\win32" \"$(INSTALL_ROOT)$$QTC_PREFIX\" \ - && rmdir /s /q binary-artifacts - QMAKE_EXTRA_TARGETS += deployartifacts - } + # legacy dummy target + win32: QMAKE_EXTRA_TARGETS += deployartifacts } INSTALLER_ARCHIVE_FROM_ENV = $$(INSTALLER_ARCHIVE) |