diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2017-07-10 09:54:52 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2017-07-10 09:54:52 +0200 |
| commit | 345ea0307cb34bc7a00acb8881fa53bedb28b0ca (patch) | |
| tree | 11b96bf9330e9c7a4b5c1b04b982be2bdd63741b /src/app | |
| parent | 491ab37b1f5499bf53b5c8e41862776ec4d3658c (diff) | |
| parent | 4196534759f7f7aa04c8675378cfec57539abc75 (diff) | |
Merge remote-tracking branch 'origin/4.3' into 4.4
Conflicts:
qtcreator.qbs
Change-Id: Ic5e268326d93172208de291d31a716e437b9cedf
Diffstat (limited to 'src/app')
| -rw-r--r-- | src/app/Info.plist | 2 | ||||
| -rw-r--r-- | src/app/app.pro | 7 | ||||
| -rw-r--r-- | src/app/app.qbs | 11 |
3 files changed, 10 insertions, 10 deletions
diff --git a/src/app/Info.plist b/src/app/Info.plist index 6d31c52d266..8447dd66d4a 100644 --- a/src/app/Info.plist +++ b/src/app/Info.plist @@ -253,6 +253,6 @@ <key>CFBundleShortVersionString</key> <string>@SHORT_VERSION@</string> <key>LSMinimumSystemVersion</key> - <string>10.8</string> + <string>@MACOSX_DEPLOYMENT_TARGET@</string> </dict> </plist> diff --git a/src/app/app.pro b/src/app/app.pro index fee710e99d7..58dca7ba050 100644 --- a/src/app/app.pro +++ b/src/app/app.pro @@ -53,7 +53,12 @@ win32 { INSTALLS += icns } } - QMAKE_INFO_PLIST = Info.plist + + infoplist = $$cat($$PWD/Info.plist, blob) + infoplist = $$replace(infoplist, @MACOSX_DEPLOYMENT_TARGET@, $$QMAKE_MACOSX_DEPLOYMENT_TARGET) + write_file($$OUT_PWD/Info.plist, infoplist) + + QMAKE_INFO_PLIST = $$OUT_PWD/Info.plist } target.path = $$INSTALL_APP_PATH diff --git a/src/app/app.qbs b/src/app/app.qbs index 2eac52ac64a..0af41ca20d9 100644 --- a/src/app/app.qbs +++ b/src/app/app.qbs @@ -20,7 +20,9 @@ QtcProduct { targetName: qtc.ide_app_target version: qtc.qtcreator_version - installDir: qtc.ide_bin_path + installDir: bundle.isBundle ? qtc.ide_app_path : qtc.ide_bin_path + installTags: bundle.isBundle ? ["bundle.content"] : base + installSourceBase: bundle.isBundle ? buildDirectory : base property bool qtcRunnable: true cpp.rpaths: qbs.targetOS.contains("macos") ? ["@executable_path/../Frameworks"] @@ -72,11 +74,4 @@ QtcProduct { "../shared/qtlockedfile/qtlockedfile_win.cpp" ] } - - Group { - condition: qbs.targetOS.contains("macos") - fileTagsFilter: ["aggregate_infoplist", "pkginfo", "compiled_assetcatalog"] - qbs.install: true - qbs.installSourceBase: product.buildDirectory - } } |