summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuha Vuolle <juha.vuolle@insta.fi>2021-11-08 14:01:23 +0200
committerJuha Vuolle <juha.vuolle@insta.fi>2021-11-18 08:10:28 +0200
commit11c69dc369793886ee31de82fa43fee64f1be91c (patch)
tree88b9bb89609d42591eaf7886391a2bd146ab2b1b
parentbd1671ac91afafcd446e305cdb303838937eb332 (diff)
macOS specific Info.plist file for Bluetooth Examples
The default-generated Info.plist is not enough on macOS 12 Monterey as the Bluetooth examples require NSBluetoothAlwaysUsageDescription key to work properly. Note that the plist files are only effective if the application is started as an app bundle, ie. not if launching the contained binary directly. Task-number: QTBUG-98090 Change-Id: Iedb7eabbb8fde6ad1ba14ada1a7ee87ec1d708ba (cherry picked from commit 70d590a81cae3c122c68bcb4521f21771cf02d40) Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
-rw-r--r--examples/bluetooth/btscanner/btscanner.pro1
-rw-r--r--examples/bluetooth/heartrate-game/heartrate-game.pro1
-rw-r--r--examples/bluetooth/heartrate-server/heartrate-server.pro1
-rw-r--r--examples/bluetooth/lowenergyscanner/lowenergyscanner.pro1
-rw-r--r--examples/bluetooth/shared/Info.qmake.macos.plist24
5 files changed, 28 insertions, 0 deletions
diff --git a/examples/bluetooth/btscanner/btscanner.pro b/examples/bluetooth/btscanner/btscanner.pro
index d5fd66ae..ee781ff7 100644
--- a/examples/bluetooth/btscanner/btscanner.pro
+++ b/examples/bluetooth/btscanner/btscanner.pro
@@ -10,6 +10,7 @@ SOURCES = \
service.cpp
ios: QMAKE_INFO_PLIST = Info.plist
+macos: QMAKE_INFO_PLIST = ../shared/Info.qmake.macos.plist
HEADERS = \
device.h \
diff --git a/examples/bluetooth/heartrate-game/heartrate-game.pro b/examples/bluetooth/heartrate-game/heartrate-game.pro
index a0827d89..02d238ad 100644
--- a/examples/bluetooth/heartrate-game/heartrate-game.pro
+++ b/examples/bluetooth/heartrate-game/heartrate-game.pro
@@ -20,6 +20,7 @@ SOURCES += main.cpp \
bluetoothbaseclass.cpp
ios: QMAKE_INFO_PLIST = Info.plist
+macos: QMAKE_INFO_PLIST = ../shared/Info.qmake.macos.plist
RESOURCES += qml.qrc \
images.qrc
diff --git a/examples/bluetooth/heartrate-server/heartrate-server.pro b/examples/bluetooth/heartrate-server/heartrate-server.pro
index 992f2d66..8ec3f703 100644
--- a/examples/bluetooth/heartrate-server/heartrate-server.pro
+++ b/examples/bluetooth/heartrate-server/heartrate-server.pro
@@ -8,6 +8,7 @@ CONFIG += c++11
SOURCES += main.cpp
ios: QMAKE_INFO_PLIST = Info.plist
+macos: QMAKE_INFO_PLIST = ../shared/Info.qmake.macos.plist
target.path = $$[QT_INSTALL_EXAMPLES]/bluetooth/heartrate-server
INSTALLS += target
diff --git a/examples/bluetooth/lowenergyscanner/lowenergyscanner.pro b/examples/bluetooth/lowenergyscanner/lowenergyscanner.pro
index 934f6cfa..31b243ac 100644
--- a/examples/bluetooth/lowenergyscanner/lowenergyscanner.pro
+++ b/examples/bluetooth/lowenergyscanner/lowenergyscanner.pro
@@ -11,6 +11,7 @@ SOURCES += main.cpp \
characteristicinfo.cpp
ios: QMAKE_INFO_PLIST = Info.plist
+macos: QMAKE_INFO_PLIST = ../shared/Info.qmake.macos.plist
OTHER_FILES += assets/*.qml
diff --git a/examples/bluetooth/shared/Info.qmake.macos.plist b/examples/bluetooth/shared/Info.qmake.macos.plist
new file mode 100644
index 00000000..80b3630b
--- /dev/null
+++ b/examples/bluetooth/shared/Info.qmake.macos.plist
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+ <key>CFBundleExecutable</key>
+ <string>${EXECUTABLE_NAME}</string>
+ <key>CFBundleIconFile</key>
+ <string></string>
+ <key>CFBundleIdentifier</key>
+ <string>${PRODUCT_BUNDLE_IDENTIFIER}</string>
+ <key>CFBundlePackageType</key>
+ <string>APPL</string>
+ <key>CFBundleSignature</key>
+ <string>????</string>
+ <key>LSMinimumSystemVersion</key>
+ <string>${MACOSX_DEPLOYMENT_TARGET}</string>
+ <key>NSPrincipalClass</key>
+ <string>NSApplication</string>
+ <key>NSBluetoothAlwaysUsageDescription</key>
+ <string>Qt BT Example wants to access your Bluetooth adapter</string>
+ <key>NSSupportsAutomaticGraphicsSwitching</key>
+ <true/>
+</dict>
+</plist>