diff options
| -rw-r--r-- | qtcreator.pri | 2 | ||||
| -rw-r--r-- | qtcreator.pro | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/qtcreator.pri b/qtcreator.pri index 0e1879419c5..2a971f29fe5 100644 --- a/qtcreator.pri +++ b/qtcreator.pri @@ -106,7 +106,7 @@ osx { # check if IDE_BUILD_TREE is actually an existing Qt Creator.app, # 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 # set output path if not set manually diff --git a/qtcreator.pro b/qtcreator.pro index 1738c44649f..c8ea8ddd37d 100644 --- a/qtcreator.pro +++ b/qtcreator.pro @@ -2,7 +2,7 @@ include(qtcreator.pri) #version check qt !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.") } @@ -108,8 +108,8 @@ linux { } macx { - APPBUNDLE = "$$OUT_PWD/bin/Qt Creator.app" - BINDIST_SOURCE = "$$OUT_PWD/bin/Qt Creator.app" + APPBUNDLE = "$$OUT_PWD/bin/$${IDE_APP_TARGET}.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]\" 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\" |