From 0768a28fbfe4c7227182b6b4b7cacbc6772c54f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Thu, 3 Oct 2019 12:36:56 +0200 Subject: [PATCH] Remove CFBundleGetInfoString from Info.plist templates MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Is't been deprecated since Mac OS X 10.5. Task-number: QTBUG-74872 Change-Id: I8b1ad7aca6448883cb164fd0c4b329592ca60548 Reviewed-by: Edward Welbourne Reviewed-by: Alexandru Croitor Reviewed-by: Tor Arne Vestbø --- mkspecs/macx-clang/Info.plist.app | 2 -- mkspecs/macx-clang/Info.plist.lib | 2 -- mkspecs/macx-g++/Info.plist.app | 2 -- mkspecs/macx-g++/Info.plist.lib | 2 -- mkspecs/macx-icc/Info.plist.app | 2 -- mkspecs/macx-icc/Info.plist.lib | 2 -- mkspecs/macx-ios-clang/Info.plist.app | 2 -- mkspecs/macx-ios-clang/Info.plist.lib | 2 -- mkspecs/macx-tvos-clang/Info.plist.app | 2 -- mkspecs/macx-tvos-clang/Info.plist.lib | 2 -- mkspecs/macx-watchos-clang/Info.plist.app | 2 -- mkspecs/macx-watchos-clang/Info.plist.lib | 2 -- tests/auto/corelib/io/qdir/Info.plist | 2 -- tests/auto/other/macplist/tst_macplist.cpp | 10 ---------- 14 files changed, 36 deletions(-) diff --git a/mkspecs/macx-clang/Info.plist.app b/mkspecs/macx-clang/Info.plist.app index 4d64a77704e..fa592af0897 100644 --- a/mkspecs/macx-clang/Info.plist.app +++ b/mkspecs/macx-clang/Info.plist.app @@ -4,8 +4,6 @@ CFBundleExecutable ${EXECUTABLE_NAME} - CFBundleGetInfoString - Created by Qt/QMake CFBundleIconFile ${ASSETCATALOG_COMPILER_APPICON_NAME} CFBundleIdentifier diff --git a/mkspecs/macx-clang/Info.plist.lib b/mkspecs/macx-clang/Info.plist.lib index ce283655000..34752ec40d9 100644 --- a/mkspecs/macx-clang/Info.plist.lib +++ b/mkspecs/macx-clang/Info.plist.lib @@ -4,8 +4,6 @@ CFBundleExecutable ${EXECUTABLE_NAME} - CFBundleGetInfoString - Created by Qt/QMake CFBundleIdentifier ${PRODUCT_BUNDLE_IDENTIFIER} CFBundlePackageType diff --git a/mkspecs/macx-g++/Info.plist.app b/mkspecs/macx-g++/Info.plist.app index 4d64a77704e..fa592af0897 100644 --- a/mkspecs/macx-g++/Info.plist.app +++ b/mkspecs/macx-g++/Info.plist.app @@ -4,8 +4,6 @@ CFBundleExecutable ${EXECUTABLE_NAME} - CFBundleGetInfoString - Created by Qt/QMake CFBundleIconFile ${ASSETCATALOG_COMPILER_APPICON_NAME} CFBundleIdentifier diff --git a/mkspecs/macx-g++/Info.plist.lib b/mkspecs/macx-g++/Info.plist.lib index ce283655000..34752ec40d9 100644 --- a/mkspecs/macx-g++/Info.plist.lib +++ b/mkspecs/macx-g++/Info.plist.lib @@ -4,8 +4,6 @@ CFBundleExecutable ${EXECUTABLE_NAME} - CFBundleGetInfoString - Created by Qt/QMake CFBundleIdentifier ${PRODUCT_BUNDLE_IDENTIFIER} CFBundlePackageType diff --git a/mkspecs/macx-icc/Info.plist.app b/mkspecs/macx-icc/Info.plist.app index 4d64a77704e..fa592af0897 100644 --- a/mkspecs/macx-icc/Info.plist.app +++ b/mkspecs/macx-icc/Info.plist.app @@ -4,8 +4,6 @@ CFBundleExecutable ${EXECUTABLE_NAME} - CFBundleGetInfoString - Created by Qt/QMake CFBundleIconFile ${ASSETCATALOG_COMPILER_APPICON_NAME} CFBundleIdentifier diff --git a/mkspecs/macx-icc/Info.plist.lib b/mkspecs/macx-icc/Info.plist.lib index ce283655000..34752ec40d9 100644 --- a/mkspecs/macx-icc/Info.plist.lib +++ b/mkspecs/macx-icc/Info.plist.lib @@ -4,8 +4,6 @@ CFBundleExecutable ${EXECUTABLE_NAME} - CFBundleGetInfoString - Created by Qt/QMake CFBundleIdentifier ${PRODUCT_BUNDLE_IDENTIFIER} CFBundlePackageType diff --git a/mkspecs/macx-ios-clang/Info.plist.app b/mkspecs/macx-ios-clang/Info.plist.app index 1acbf9d768b..03ba3e82b49 100644 --- a/mkspecs/macx-ios-clang/Info.plist.app +++ b/mkspecs/macx-ios-clang/Info.plist.app @@ -6,8 +6,6 @@ ${PRODUCT_NAME} CFBundleExecutable ${EXECUTABLE_NAME} - CFBundleGetInfoString - Created by Qt/QMake CFBundleIconFile ${ASSETCATALOG_COMPILER_APPICON_NAME} CFBundleIdentifier diff --git a/mkspecs/macx-ios-clang/Info.plist.lib b/mkspecs/macx-ios-clang/Info.plist.lib index ce283655000..34752ec40d9 100644 --- a/mkspecs/macx-ios-clang/Info.plist.lib +++ b/mkspecs/macx-ios-clang/Info.plist.lib @@ -4,8 +4,6 @@ CFBundleExecutable ${EXECUTABLE_NAME} - CFBundleGetInfoString - Created by Qt/QMake CFBundleIdentifier ${PRODUCT_BUNDLE_IDENTIFIER} CFBundlePackageType diff --git a/mkspecs/macx-tvos-clang/Info.plist.app b/mkspecs/macx-tvos-clang/Info.plist.app index 04aef816c26..b9b67fe41e9 100644 --- a/mkspecs/macx-tvos-clang/Info.plist.app +++ b/mkspecs/macx-tvos-clang/Info.plist.app @@ -8,8 +8,6 @@ ${PRODUCT_NAME} CFBundleExecutable ${EXECUTABLE_NAME} - CFBundleGetInfoString - Created by Qt/QMake CFBundleIcons CFBundlePrimaryIcon diff --git a/mkspecs/macx-tvos-clang/Info.plist.lib b/mkspecs/macx-tvos-clang/Info.plist.lib index ce283655000..34752ec40d9 100644 --- a/mkspecs/macx-tvos-clang/Info.plist.lib +++ b/mkspecs/macx-tvos-clang/Info.plist.lib @@ -4,8 +4,6 @@ CFBundleExecutable ${EXECUTABLE_NAME} - CFBundleGetInfoString - Created by Qt/QMake CFBundleIdentifier ${PRODUCT_BUNDLE_IDENTIFIER} CFBundlePackageType diff --git a/mkspecs/macx-watchos-clang/Info.plist.app b/mkspecs/macx-watchos-clang/Info.plist.app index 47f5a58d5e5..5ac0ef78a08 100644 --- a/mkspecs/macx-watchos-clang/Info.plist.app +++ b/mkspecs/macx-watchos-clang/Info.plist.app @@ -8,8 +8,6 @@ ${PRODUCT_NAME} CFBundleExecutable ${EXECUTABLE_NAME} - CFBundleGetInfoString - Created by Qt/QMake CFBundleIdentifier ${PRODUCT_BUNDLE_IDENTIFIER} CFBundleName diff --git a/mkspecs/macx-watchos-clang/Info.plist.lib b/mkspecs/macx-watchos-clang/Info.plist.lib index ce283655000..34752ec40d9 100644 --- a/mkspecs/macx-watchos-clang/Info.plist.lib +++ b/mkspecs/macx-watchos-clang/Info.plist.lib @@ -4,8 +4,6 @@ CFBundleExecutable ${EXECUTABLE_NAME} - CFBundleGetInfoString - Created by Qt/QMake CFBundleIdentifier ${PRODUCT_BUNDLE_IDENTIFIER} CFBundlePackageType diff --git a/tests/auto/corelib/io/qdir/Info.plist b/tests/auto/corelib/io/qdir/Info.plist index 7dc5622bde3..e1f6fbe24a5 100644 --- a/tests/auto/corelib/io/qdir/Info.plist +++ b/tests/auto/corelib/io/qdir/Info.plist @@ -6,8 +6,6 @@ ${PRODUCT_NAME} CFBundleExecutable ${EXECUTABLE_NAME} - CFBundleGetInfoString - Created by Qt/QMake CFBundleIconFile ${ASSETCATALOG_COMPILER_APPICON_NAME} CFBundleIdentifier diff --git a/tests/auto/other/macplist/tst_macplist.cpp b/tests/auto/other/macplist/tst_macplist.cpp index 755cc462f55..dec63b1b662 100644 --- a/tests/auto/other/macplist/tst_macplist.cpp +++ b/tests/auto/other/macplist/tst_macplist.cpp @@ -59,8 +59,6 @@ void tst_MacPlist::test_plist_data() " \n" " CFBundlePackageType\n" " APPL\n" -" CFBundleGetInfoString\n" -" Created by Qt/QMake\n" " CFBundleExecutable\n" " app\n" " CFBundleIdentifier\n" @@ -77,8 +75,6 @@ void tst_MacPlist::test_plist_data() " \n" " CFBundlePackageType\n" " APPL\n" -" CFBundleGetInfoString\n" -" Created by Qt/QMake\n" " CFBundleExecutable\n" " app\n" " CFBundleIdentifier\n" @@ -97,8 +93,6 @@ void tst_MacPlist::test_plist_data() " \n" " CFBundlePackageType\n" " APPL\n" -" CFBundleGetInfoString\n" -" Created by Qt/QMake\n" " CFBundleExecutable\n" " app\n" " CFBundleIdentifier\n" @@ -117,8 +111,6 @@ void tst_MacPlist::test_plist_data() " \n" " CFBundlePackageType\n" " APPL\n" -" CFBundleGetInfoString\n" -" Created by Qt/QMake\n" " CFBundleExecutable\n" " app\n" " CFBundleIdentifier\n" @@ -137,8 +129,6 @@ void tst_MacPlist::test_plist_data() " \n" " CFBundlePackageType\n" " APPL\n" -" CFBundleGetInfoString\n" -" Created by Qt/QMake\n" " CFBundleExecutable\n" " app\n" " CFBundleIdentifier\n"