forked from qt-creator/qt-creator
Fix more issues with renaming Qt Creator executable
Change-Id: I826469bdd90e482a77f4cd65fd4fa7e541103a12 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
This commit is contained in:
@@ -106,7 +106,7 @@ osx {
|
|||||||
|
|
||||||
# check if IDE_BUILD_TREE is actually an existing Qt Creator.app,
|
# check if IDE_BUILD_TREE is actually an existing Qt Creator.app,
|
||||||
# for building against a binary package
|
# for building against a binary package
|
||||||
exists($$IDE_BUILD_TREE/Contents/MacOS/Qt Creator): IDE_APP_BUNDLE = $$IDE_BUILD_TREE
|
exists($$IDE_BUILD_TREE/Contents/MacOS/$$IDE_APP_TARGET): IDE_APP_BUNDLE = $$IDE_BUILD_TREE
|
||||||
else: IDE_APP_BUNDLE = $$IDE_APP_PATH/$${IDE_APP_TARGET}.app
|
else: IDE_APP_BUNDLE = $$IDE_APP_PATH/$${IDE_APP_TARGET}.app
|
||||||
|
|
||||||
# set output path if not set manually
|
# set output path if not set manually
|
||||||
|
@@ -2,7 +2,7 @@ include(qtcreator.pri)
|
|||||||
|
|
||||||
#version check qt
|
#version check qt
|
||||||
!minQtVersion(5, 6, 2) {
|
!minQtVersion(5, 6, 2) {
|
||||||
message("Cannot build Qt Creator with Qt version $${QT_VERSION}.")
|
message("Cannot build $$IDE_DISPLAY_NAME with Qt version $${QT_VERSION}.")
|
||||||
error("Use at least Qt 5.6.2.")
|
error("Use at least Qt 5.6.2.")
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -108,8 +108,8 @@ linux {
|
|||||||
}
|
}
|
||||||
|
|
||||||
macx {
|
macx {
|
||||||
APPBUNDLE = "$$OUT_PWD/bin/Qt Creator.app"
|
APPBUNDLE = "$$OUT_PWD/bin/$${IDE_APP_TARGET}.app"
|
||||||
BINDIST_SOURCE = "$$OUT_PWD/bin/Qt Creator.app"
|
BINDIST_SOURCE = "$$OUT_PWD/bin/$${IDE_APP_TARGET}.app"
|
||||||
deployqt.commands = $$PWD/scripts/deployqtHelper_mac.sh \"$${APPBUNDLE}\" \"$$[QT_INSTALL_BINS]\" \"$$[QT_INSTALL_TRANSLATIONS]\" \"$$[QT_INSTALL_PLUGINS]\" \"$$[QT_INSTALL_IMPORTS]\" \"$$[QT_INSTALL_QML]\"
|
deployqt.commands = $$PWD/scripts/deployqtHelper_mac.sh \"$${APPBUNDLE}\" \"$$[QT_INSTALL_BINS]\" \"$$[QT_INSTALL_TRANSLATIONS]\" \"$$[QT_INSTALL_PLUGINS]\" \"$$[QT_INSTALL_IMPORTS]\" \"$$[QT_INSTALL_QML]\"
|
||||||
codesign.commands = codesign --deep -s \"$(SIGNING_IDENTITY)\" $(SIGNING_FLAGS) \"$${APPBUNDLE}\"
|
codesign.commands = codesign --deep -s \"$(SIGNING_IDENTITY)\" $(SIGNING_FLAGS) \"$${APPBUNDLE}\"
|
||||||
dmg.commands = python -u \"$$PWD/scripts/makedmg.py\" \"$${BASENAME}.dmg\" \"Qt Creator\" \"$$IDE_SOURCE_TREE\" \"$$OUT_PWD/bin\"
|
dmg.commands = python -u \"$$PWD/scripts/makedmg.py\" \"$${BASENAME}.dmg\" \"Qt Creator\" \"$$IDE_SOURCE_TREE\" \"$$OUT_PWD/bin\"
|
||||||
|
Reference in New Issue
Block a user