diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-05-14 14:51:46 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-05-14 14:51:46 +0200 |
| commit | 7e1b504f31dcdad0b055c1532209e44f81033bc9 (patch) | |
| tree | b7ab4b258a50af69179fa6efb4871c7218e475e1 /mkspecs/features/mac/default_pre.prf | |
| parent | 432df3f8c8504b333ecc76df4ce19a7b2c04ae77 (diff) | |
| parent | 627de835b1b87280741eb96ae77ea42b1f6ef5dc (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Conflicts:
mkspecs/features/qt_module_headers.prf
tests/auto/widgets/itemviews/qheaderview/tst_qheaderview.cpp
tests/auto/widgets/kernel/qwidget/BLACKLIST
Change-Id: I2a08952d28d1d0e3d73f521a3d44700ce79ff16c
Diffstat (limited to 'mkspecs/features/mac/default_pre.prf')
| -rw-r--r-- | mkspecs/features/mac/default_pre.prf | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/mkspecs/features/mac/default_pre.prf b/mkspecs/features/mac/default_pre.prf index f1a4ca77b2..e3534561a5 100644 --- a/mkspecs/features/mac/default_pre.prf +++ b/mkspecs/features/mac/default_pre.prf @@ -58,10 +58,3 @@ QMAKE_XCODE_LIBRARY_SUFFIX_SETTING = QT_LIBRARY_SUFFIX xcode_copy_phase_strip_setting.name = COPY_PHASE_STRIP xcode_copy_phase_strip_setting.value = NO QMAKE_MAC_XCODE_SETTINGS += xcode_copy_phase_strip_setting - -xcode_product_bundle_identifier_setting.name = PRODUCT_BUNDLE_IDENTIFIER -xcode_product_bundle_identifier_setting.value = $$QMAKE_TARGET_BUNDLE_PREFIX -isEmpty(xcode_product_bundle_identifier_setting.value): \ - xcode_product_bundle_identifier_setting.value = "com.yourcompany" -xcode_product_bundle_identifier_setting.value = "$${xcode_product_bundle_identifier_setting.value}.${PRODUCT_NAME:rfc1034identifier}" -QMAKE_MAC_XCODE_SETTINGS += xcode_product_bundle_identifier_setting |