Merge remote-tracking branch 'origin/5.8' into dev

Conflicts:
	src/plugins/sensors/ios/ios.pro

Change-Id: I8d9ca692713c8ba5d8c243371474b0e61630b05e

1 files changed, 40 insertions, 16 deletions

diff --git a/src/plugins/sensors/ios/ios.pro b/src/plugins/sensors/ios/ios.pro
index b7ddb8f..91ec3ae 100644
--- a/src/plugins/sensors/ios/ios.pro
+++ b/src/plugins/sensors/ios/ios.pro
@@ -3,22 +3,46 @@ QT = core sensors
 
 OTHER_FILES = plugin.json
 
-HEADERS += iosaccelerometer.h \
-        iosmotionmanager.h \
-        iosgyroscope.h \
-        iosmagnetometer.h \
-        ioscompass.h \
-        iosproximitysensor.h
-
-OBJECTIVE_SOURCES += main.mm \
-    iosaccelerometer.mm \
-    iosmotionmanager.mm \
-    iosgyroscope.mm \
-    iosmagnetometer.mm \
-    ioscompass.mm \
-    iosproximitysensor.mm
-
-LIBS += -framework Foundation -framework UIKit -framework CoreMotion -framework CoreLocation
+OBJECTIVE_SOURCES += main.mm
+LIBS += -framework Foundation
+
+uikit {
+    ios {
+        HEADERS += \
+            ioscompass.h
+        OBJECTIVE_SOURCES += \
+            ioscompass.mm
+
+        DEFINES += HAVE_COMPASS
+        LIBS += -framework CoreLocation
+    }
+
+    !tvos {
+        HEADERS += \
+            iosaccelerometer.h \
+            iosgyroscope.h \
+            iosmagnetometer.h \
+            iosmotionmanager.h
+        OBJECTIVE_SOURCES += \
+            iosaccelerometer.mm \
+            iosgyroscope.mm \
+            iosmagnetometer.mm \
+            iosmotionmanager.mm
+
+        DEFINES += HAVE_COREMOTION
+        LIBS += -framework CoreMotion
+    }
+
+    !watchos {
+        HEADERS += \
+            iosproximitysensor.h
+        OBJECTIVE_SOURCES += \
+            iosproximitysensor.mm
+
+        DEFINES += HAVE_UIDEVICE
+        LIBS += -framework UIKit
+    }
+}
 
 PLUGIN_TYPE = sensors
 PLUGIN_CLASS_NAME = IOSSensorPlugin