diff options
| author | Eike Ziller <eike.ziller@theqtcompany.com> | 2014-10-28 17:58:23 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@theqtcompany.com> | 2014-10-28 18:00:44 +0100 |
| commit | 29d20a9f85a5aba97438a7d7b4a1cb65ad9058ad (patch) | |
| tree | 76d20ebfca22d6a24ef172e14adfddbfb1712b57 /qtcreator.pro | |
| parent | acda46616b85883fa0c1fe3f60f2fd680fd179c8 (diff) | |
Temporarily (?) remove make dependencies on deployqt target
Definitely avoid deploying Qt multiple times, since
this might be a reason for code signature verification on OS X bailing
out, claiming that files have been modified.
Change-Id: Ic45b6fd4af75a3b972aec8c0b4841f0ff4e7886d
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
Diffstat (limited to 'qtcreator.pro')
| -rw-r--r-- | qtcreator.pro | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/qtcreator.pro b/qtcreator.pro index 9348dcabe6..cbc959a00d 100644 --- a/qtcreator.pro +++ b/qtcreator.pro @@ -92,7 +92,7 @@ macx { deployqt.commands = $$PWD/scripts/deployqtHelper_mac.sh \"$${APPBUNDLE}\" \"$$[QT_INSTALL_TRANSLATIONS]\" \"$$[QT_INSTALL_PLUGINS]\" \"$$[QT_INSTALL_IMPORTS]\" \"$$[QT_INSTALL_QML]\" codesign.commands = codesign --deep -s \"$(SIGNING_IDENTITY)\" $(SIGNING_FLAGS) \"$${APPBUNDLE}\" dmg.commands = $$PWD/scripts/makedmg.sh $$OUT_PWD/bin $${BASENAME}.dmg - dmg.depends = deployqt + #dmg.depends = deployqt QMAKE_EXTRA_TARGETS += codesign dmg } else { BINDIST_SOURCE = "$(INSTALL_ROOT)$$QTC_PREFIX" @@ -113,9 +113,9 @@ isEmpty(INSTALLER_ARCHIVE_FROM_ENV) { INSTALLER_ARCHIVE = $$OUT_PWD/$$(INSTALLER_ARCHIVE) } -bindist.depends = deployqt +#bindist.depends = deployqt bindist.commands = 7z a -mx9 $$OUT_PWD/$${BASENAME}.7z \"$$BINDIST_SOURCE\" -bindist_installer.depends = deployqt +#bindist_installer.depends = deployqt bindist_installer.commands = 7z a -mx9 $${INSTALLER_ARCHIVE} \"$$BINDIST_INSTALLER_SOURCE\" installer.depends = bindist_installer installer.commands = python -u $$PWD/scripts/packageIfw.py -i \"$(IFW_PATH)\" -v $${QTCREATOR_VERSION} -a \"$${INSTALLER_ARCHIVE}\" "$$INSTALLER_NAME" |