Various cleanups

emericg · Jan 27, 2024 · f0add5a · f0add5a
1 parent cd79f74
commit f0add5a
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 6 deletions.
diff --git a/assets/assets.qrc b/assets/assets.qrc
@@ -122,6 +122,7 @@
         <file>icons_material/duotone-format_size-24px.svg</file>
         <file>icons_material/duotone-date_range-24px.svg</file>
         <file>icons_material/duotone-date_clear-24px.svg</file>
+        <file>icons_material/duotone-info-24px.svg</file>
         <file>icons_material/duotone-insert_chart-24px.svg</file>
         <file>icons_material/duotone-launch-24px.svg</file>
         <file>icons_material/duotone-local_drink-24px.svg</file>

diff --git a/assets/ios/Info.plist b/assets/ios/Info.plist
@@ -32,6 +32,8 @@
 	<string>WatchFlower connects to Bluetooth Low Energy sensors.</string>
 	<key>NSBluetoothPeripheralUsageDescription</key>
 	<string>WatchFlower connects to Bluetooth Low Energy sensors.</string>
+	<key>ITSAppUsesNonExemptEncryption</key>
+	<false/>
 	<key>UILaunchStoryboardName</key>
 	<string>AppLaunchScreen</string>
 	<key>UISupportedInterfaceOrientations</key>

diff --git a/src/device.h b/src/device.h
@@ -67,6 +67,7 @@ class Device: public QObject
     Q_PROPERTY(bool isLight READ isLight NOTIFY sensorUpdated)
     Q_PROPERTY(bool isBeacon READ isBeacon NOTIFY sensorUpdated)
     Q_PROPERTY(bool isRemote READ isRemote NOTIFY sensorUpdated)
+    Q_PROPERTY(bool isPBP READ isPBP NOTIFY sensorUpdated)
     Q_PROPERTY(bool isPGP READ isPGP NOTIFY sensorUpdated)
 
     Q_PROPERTY(bool hasBluetoothConnection READ hasBluetoothConnection CONSTANT)
@@ -280,6 +281,7 @@ class Device: public QObject
     bool isLight() const { return (m_deviceType == DeviceUtils::DEVICE_LIGHT); }
     bool isBeacon() const { return (m_deviceType == DeviceUtils::DEVICE_BEACON); }
     bool isRemote() const { return (m_deviceType == DeviceUtils::DEVICE_REMOTE); }
+    bool isPBP() const { return (m_deviceType == DeviceUtils::DEVICE_PBP); }
     bool isPGP() const { return (m_deviceType == DeviceUtils::DEVICE_PGP); }
 
     virtual bool hasRealTime() const { return (m_deviceCapabilities & DeviceUtils::DEVICE_REALTIME); }

diff --git a/src/thirdparty/MobileSharing/CMakeLists.txt b/src/thirdparty/MobileSharing/CMakeLists.txt
@@ -1,9 +1,11 @@
-cmake_minimum_required(VERSION 3.12)
+cmake_minimum_required(VERSION 3.20)
 
 project(MobileSharing LANGUAGES CXX)
 
 set(CMAKE_CXX_STANDARD 14)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
 
 ################################################################################
 
@@ -23,7 +25,7 @@ set(CORE_SOURCES
     SharingUtils.cpp SharingUtils.h)
 
 # OS specific sources & dependencies
-if(ANDROID)
+if (ANDROID)
     if(QT_DEFAULT_MAJOR_VERSION EQUAL 6)
         set(PLATFORM_SOURCES
             SharingUtils_android_qt6.cpp
@@ -39,7 +41,7 @@ if(ANDROID)
         set(PLATFORM_LIBRARIES Qt::AndroidExtras)
     endif()
 
-elseif(IOS)
+elseif (IOS)
     find_package(Qt${QT_DEFAULT_MAJOR_VERSION} REQUIRED COMPONENTS Quick)
     set(PLATFORM_LIBRARIES Qt::Quick)
     set(PLATFORM_SOURCES

diff --git a/src/thirdparty/MobileSharing/MobileSharing.pri b/src/thirdparty/MobileSharing/MobileSharing.pri
@@ -43,8 +43,8 @@ android {
 ios {
     LIBS += -framework UIKit
 
-    OBJECTIVE_SOURCES += $${PWD}/SharingUtils_ios.mm \
-                         $${PWD}/docviewcontroller_ios.mm
+    SOURCES += $${PWD}/SharingUtils_ios.mm \
+               $${PWD}/docviewcontroller_ios.mm
 
     HEADERS += $${PWD}/SharingUtils_ios.h \
                $${PWD}/docviewcontroller_ios.h

diff --git a/src/thirdparty/MobileUI/MobileUI.pri b/src/thirdparty/MobileUI/MobileUI.pri
@@ -16,7 +16,7 @@ android {
     }
 } else: ios {
     LIBS += -framework UIKit
-    OBJECTIVE_SOURCES += $${PWD}/MobileUI_ios.mm
+    SOURCES += $${PWD}/MobileUI_ios.mm
 } else {
     SOURCES += $${PWD}/MobileUI_dummy.cpp
 }