Merge remote-tracking branch 'origin/5.6' into 5.7

Change-Id: I18bb1c341e7d87cd1d649f2c3fc9c50141c6a1a9

8 files changed, 41 insertions, 34 deletions

diff --git a/src/plugins/position/android/src/src.pro b/src/plugins/position/android/src/src.pro
index 9c81dde5..3a19c85e 100644
--- a/src/plugins/position/android/src/src.pro
+++ b/src/plugins/position/android/src/src.pro
@@ -1,10 +1,6 @@
 TARGET = qtposition_android
-QT = core positioning
-
-PLUGIN_TYPE = position
-PLUGIN_CLASS_NAME = QGeoPositionInfoSourceFactoryAndroid
-load(qt_plugin)
 
+QT = core positioning
 
 HEADERS = \
     positionfactory_android.h \
@@ -19,3 +15,7 @@ SOURCES = \
     qgeosatelliteinfosource_android.cpp
 
 OTHER_FILES = plugin.json
+
+PLUGIN_TYPE = position
+PLUGIN_CLASS_NAME = QGeoPositionInfoSourceFactoryAndroid
+load(qt_plugin)
diff --git a/src/plugins/position/corelocation/corelocation.pro b/src/plugins/position/corelocation/corelocation.pro
index 1415643b..dbb5b6b3 100644
--- a/src/plugins/position/corelocation/corelocation.pro
+++ b/src/plugins/position/corelocation/corelocation.pro
@@ -1,9 +1,6 @@
 TARGET = qtposition_cl
-QT = core positioning
 
-PLUGIN_TYPE = position
-PLUGIN_CLASS_NAME = QGeoPositionInfoSourceFactoryCL
-load(qt_plugin)
+QT = core positioning
 
 OBJECTIVE_SOURCES += \
     qgeopositioninfosource_cl.mm \
@@ -19,3 +16,7 @@ OTHER_FILES += \
 osx: LIBS += -framework Foundation
 else: ios|tvos: LIBS += -framework CoreFoundation
 LIBS += -framework CoreLocation
+
+PLUGIN_TYPE = position
+PLUGIN_CLASS_NAME = QGeoPositionInfoSourceFactoryCL
+load(qt_plugin)
diff --git a/src/plugins/position/geoclue/geoclue.pro b/src/plugins/position/geoclue/geoclue.pro
index 0d9aab7d..3f75cbf0 100644
--- a/src/plugins/position/geoclue/geoclue.pro
+++ b/src/plugins/position/geoclue/geoclue.pro
@@ -1,9 +1,6 @@
 TARGET = qtposition_geoclue
-QT = core positioning dbus
 
-PLUGIN_TYPE = position
-PLUGIN_CLASS_NAME = QGeoPositionInfoSourceFactoryGeoclue
-load(qt_plugin)
+QT = core positioning dbus
 
 HEADERS += \
     qgeopositioninfosource_geocluemaster.h \
@@ -35,3 +32,7 @@ INCLUDEPATH += $$QT.location.includes $$OUT_PWD
 
 OTHER_FILES += \
     plugin.json
+
+PLUGIN_TYPE = position
+PLUGIN_CLASS_NAME = QGeoPositionInfoSourceFactoryGeoclue
+load(qt_plugin)
diff --git a/src/plugins/position/gypsy/gypsy.pro b/src/plugins/position/gypsy/gypsy.pro
index f5c5a087..be65f183 100644
--- a/src/plugins/position/gypsy/gypsy.pro
+++ b/src/plugins/position/gypsy/gypsy.pro
@@ -1,9 +1,6 @@
 TARGET = qtposition_gypsy
-QT = core positioning
 
-PLUGIN_TYPE = position
-PLUGIN_CLASS_NAME = QGeoPositionInfoSourceFactoryGypsy
-load(qt_plugin)
+QT = core positioning
 
 HEADERS += \
     qgeosatelliteinfosource_gypsy_p.h \
@@ -18,3 +15,7 @@ PKGCONFIG += gypsy gconf-2.0
 
 OTHER_FILES += \
     plugin.json
+
+PLUGIN_TYPE = position
+PLUGIN_CLASS_NAME = QGeoPositionInfoSourceFactoryGypsy
+load(qt_plugin)
diff --git a/src/plugins/position/positionpoll/positionpoll.pro b/src/plugins/position/positionpoll/positionpoll.pro
index cb84e79a..be60bf43 100644
--- a/src/plugins/position/positionpoll/positionpoll.pro
+++ b/src/plugins/position/positionpoll/positionpoll.pro
@@ -1,9 +1,6 @@
 TARGET = qtposition_positionpoll
-QT = core positioning
 
-PLUGIN_TYPE = position
-PLUGIN_CLASS_NAME = QGeoPositionInfoSourceFactoryPoll
-load(qt_plugin)
+QT = core positioning
 
 SOURCES += \
     qgeoareamonitor_polling.cpp \
@@ -15,3 +12,7 @@ HEADERS += \
 
 OTHER_FILES += \
     plugin.json
+
+PLUGIN_TYPE = position
+PLUGIN_CLASS_NAME = QGeoPositionInfoSourceFactoryPoll
+load(qt_plugin)
diff --git a/src/plugins/position/serialnmea/serialnmea.pro b/src/plugins/position/serialnmea/serialnmea.pro
index 81570837..bdeb3f13 100644
--- a/src/plugins/position/serialnmea/serialnmea.pro
+++ b/src/plugins/position/serialnmea/serialnmea.pro
@@ -1,9 +1,6 @@
 TARGET = qtposition_serialnmea
-QT = core positioning serialport
 
-PLUGIN_TYPE = position
-PLUGIN_CLASS_NAME = QGeoPositionInfoSourceFactorySerialNmea
-load(qt_plugin)
+QT = core positioning serialport
 
 HEADERS += \
     qgeopositioninfosourcefactory_serialnmea.h
@@ -13,3 +10,7 @@ SOURCES += \
 
 OTHER_FILES += \
     plugin.json
+
+PLUGIN_TYPE = position
+PLUGIN_CLASS_NAME = QGeoPositionInfoSourceFactorySerialNmea
+load(qt_plugin)
diff --git a/src/plugins/position/simulator/simulator.pro b/src/plugins/position/simulator/simulator.pro
index dc00ae1a..c3e6ea3c 100644
--- a/src/plugins/position/simulator/simulator.pro
+++ b/src/plugins/position/simulator/simulator.pro
@@ -1,12 +1,9 @@
 TARGET = qtposition_simulator
-QT = core network positioning
 
-PLUGIN_TYPE = position
-PLUGIN_CLASS_NAME = QGeoPositionInfoSourceFactorySimulator
-load(qt_plugin)
+QT = core network positioning simulator
+
 INCLUDEPATH += ../../../positioning
 
-QT += simulator
 DEFINES += QT_SIMULATOR
 SOURCES += qgeopositioninfosource_simulator.cpp \
             qgeosatelliteinfosource_simulator.cpp \
@@ -19,3 +16,7 @@ HEADERS += qgeopositioninfosource_simulator_p.h \
 
 OTHER_FILES += \
     plugin.json
+
+PLUGIN_TYPE = position
+PLUGIN_CLASS_NAME = QGeoPositionInfoSourceFactorySimulator
+load(qt_plugin)
diff --git a/src/plugins/position/winrt/winrt.pro b/src/plugins/position/winrt/winrt.pro
index c58c6c18..bc740671 100644
--- a/src/plugins/position/winrt/winrt.pro
+++ b/src/plugins/position/winrt/winrt.pro
@@ -1,9 +1,6 @@
 TARGET = qtposition_winrt
-QT = core core-private positioning
 
-PLUGIN_TYPE = position
-PLUGIN_CLASS_NAME = QGeoPositionInfoSourceFactoryWinRT
-load(qt_plugin)
+QT = core core-private positioning
 
 SOURCES += qgeopositioninfosource_winrt.cpp \
     qgeopositioninfosourcefactory_winrt.cpp
@@ -12,3 +9,7 @@ HEADERS += qgeopositioninfosource_winrt_p.h \
 
 OTHER_FILES += \
     plugin.json
+
+PLUGIN_TYPE = position
+PLUGIN_CLASS_NAME = QGeoPositionInfoSourceFactoryWinRT
+load(qt_plugin)