diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2019-05-17 16:12:25 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2019-05-20 12:28:36 +0000 |
| commit | fc04ec1c3e90c2085f3fefaca82dfaa0f4d5c89e (patch) | |
| tree | 18178bbe1d56e0fd2ae1ab2695bb79cbe3a1ce2f /src/app | |
| parent | c84885bc9f068188ecef925788f86db3ff77dab8 (diff) | |
CMake build / macOS: Fix Info.plist
Change-Id: I160c9efd10e62b7e17957117daed376d2ce70601
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Diffstat (limited to 'src/app')
| -rw-r--r-- | src/app/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | src/app/app-Info.plist | 12 | ||||
| -rw-r--r-- | src/app/app.pro | 8 |
3 files changed, 17 insertions, 9 deletions
diff --git a/src/app/CMakeLists.txt b/src/app/CMakeLists.txt index 3375fbee0e..fc5c1b3ce9 100644 --- a/src/app/CMakeLists.txt +++ b/src/app/CMakeLists.txt @@ -37,3 +37,9 @@ add_custom_command(TARGET qtcreator POST_BUILD COMMAND "${CMAKE_COMMAND}" -E copy_directory "${PROJECT_SOURCE_DIR}/share/qtcreator" "${PROJECT_BINARY_DIR}/${IDE_DATA_PATH}") + +if (APPLE) + set_target_properties(qtcreator PROPERTIES + MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/app-Info.plist" + ) +endif() diff --git a/src/app/app-Info.plist b/src/app/app-Info.plist index 2e2614b34a..b9cf951b8d 100644 --- a/src/app/app-Info.plist +++ b/src/app/app-Info.plist @@ -235,7 +235,7 @@ </dict> </array> <key>NSHumanReadableCopyright</key> - <string>(C) @QTCREATOR_COPYRIGHT_YEAR@ The Qt Company Ltd</string> + <string>(C) ${IDE_COPYRIGHT_YEAR} The Qt Company Ltd</string> <key>CFBundleIconFile</key> <string>qtcreator</string> <key>CFBundlePackageType</key> @@ -243,15 +243,15 @@ <key>CFBundleSignature</key> <string>????</string> <key>CFBundleExecutable</key> - <string>@EXECUTABLE@</string> + <string>${IDE_APP_TARGET}</string> <key>CFBundleIdentifier</key> - <string>@PRODUCT_BUNDLE_IDENTIFIER@</string> + <string>${IDE_BUNDLE_IDENTIFIER}</string> <key>CFBundleVersion</key> - <string>@FULL_VERSION@</string> + <string>${IDE_VERSION}</string> <key>CFBundleShortVersionString</key> - <string>@SHORT_VERSION@</string> + <string>${IDE_VERSION}</string> <key>LSMinimumSystemVersion</key> - <string>@MACOSX_DEPLOYMENT_TARGET@</string> + <string>${MACOSX_DEPLOYMENT_TARGET}</string> <key>NSAppleEventsUsageDescription</key> <string>This application wants to run AppleScript.</string> <key>NSBluetoothPeripheralUsageDescription</key> diff --git a/src/app/app.pro b/src/app/app.pro index e1ef8d2f8e..8621a63f02 100644 --- a/src/app/app.pro +++ b/src/app/app.pro @@ -38,9 +38,11 @@ win32 { QMAKE_ASSET_CATALOGS_APP_ICON = qtcreator infoplist = $$cat($$PWD/app-Info.plist, blob) - infoplist = $$replace(infoplist, @MACOSX_DEPLOYMENT_TARGET@, $$QMAKE_MACOSX_DEPLOYMENT_TARGET) - infoplist = $$replace(infoplist, @QTCREATOR_COPYRIGHT_YEAR@, $$QTCREATOR_COPYRIGHT_YEAR) - infoplist = $$replace(infoplist, @PRODUCT_BUNDLE_IDENTIFIER@, $$PRODUCT_BUNDLE_IDENTIFIER) + infoplist = $$replace(infoplist, \\$\\{MACOSX_DEPLOYMENT_TARGET\\}, $$QMAKE_MACOSX_DEPLOYMENT_TARGET) + infoplist = $$replace(infoplist, \\$\\{IDE_COPYRIGHT_YEAR\\}, $$QTCREATOR_COPYRIGHT_YEAR) + infoplist = $$replace(infoplist, \\$\\{IDE_APP_TARGET\\}, $$IDE_APP_TARGET) + infoplist = $$replace(infoplist, \\$\\{IDE_BUNDLE_IDENTIFIER\\}, $$PRODUCT_BUNDLE_IDENTIFIER) + infoplist = $$replace(infoplist, \\$\\{IDE_VERSION\\}, $$QTCREATOR_VERSION) write_file($$OUT_PWD/Info.plist, infoplist) QMAKE_INFO_PLIST = $$OUT_PWD/Info.plist |