diff options
author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-02-12 16:37:39 +0100 |
---|---|---|
committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-02-25 16:54:07 +0000 |
commit | d16eefbeac6b34939d247ae6056fc4fbbea774c5 (patch) | |
tree | f1b9c71583f1b2415e4bd60ccfa406b3770d69cc /src | |
parent | fbaca62cd0a7309f04bf82101c8e20dbbf423192 (diff) | |
download | qtsensors-d16eefbeac6b34939d247ae6056fc4fbbea774c5.tar.gz |
consistently put {qt,qml}_{module,plugin} at the end of project files
this fixes static builds by ensuring that all dependencies are exported.
Task-number: QTBUG-51071
Change-Id: Ia3c3f69505650fd35982fc76e385e744b877e4df
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/plugins/sensorgestures/qtsensors/qtsensors.pro | 9 | ||||
-rw-r--r-- | src/plugins/sensorgestures/shake/shake.pro | 9 | ||||
-rw-r--r-- | src/plugins/sensors/android/src/src.pro | 9 | ||||
-rw-r--r-- | src/plugins/sensors/dummy/dummy.pro | 8 | ||||
-rw-r--r-- | src/plugins/sensors/generic/generic.pro | 8 | ||||
-rw-r--r-- | src/plugins/sensors/ios/ios.pro | 8 | ||||
-rw-r--r-- | src/plugins/sensors/linux/linux.pro | 8 | ||||
-rw-r--r-- | src/plugins/sensors/sensorfw/sensorfw.pro | 8 | ||||
-rw-r--r-- | src/plugins/sensors/simulator/simulator.pro | 8 | ||||
-rw-r--r-- | src/plugins/sensors/winrt/winrt.pro | 8 | ||||
-rw-r--r-- | src/sensors/sensors.pro | 10 |
11 files changed, 46 insertions, 47 deletions
diff --git a/src/plugins/sensorgestures/qtsensors/qtsensors.pro b/src/plugins/sensorgestures/qtsensors/qtsensors.pro index 3f8df03..44f18ff 100644 --- a/src/plugins/sensorgestures/qtsensors/qtsensors.pro +++ b/src/plugins/sensorgestures/qtsensors/qtsensors.pro @@ -1,11 +1,6 @@ TARGET = qtsensorgestures_plugin QT = core sensors -PLUGIN_TYPE = sensorgestures -PLUGIN_CLASS_NAME = QtSensorGesturePlugin -PLUGIN_EXTENDS = - -load(qt_plugin) - # Input HEADERS += qtsensorgestureplugin.h \ qcoversensorgesturerecognizer.h \ @@ -36,3 +31,7 @@ SOURCES += qtsensorgestureplugin.cpp \ OTHER_FILES += \ plugin.json +PLUGIN_TYPE = sensorgestures +PLUGIN_CLASS_NAME = QtSensorGesturePlugin +PLUGIN_EXTENDS = - +load(qt_plugin) diff --git a/src/plugins/sensorgestures/shake/shake.pro b/src/plugins/sensorgestures/shake/shake.pro index d7d8f92..efa2a0c 100644 --- a/src/plugins/sensorgestures/shake/shake.pro +++ b/src/plugins/sensorgestures/shake/shake.pro @@ -1,11 +1,6 @@ TARGET = qtsensorgestures_shakeplugin QT = core sensors -PLUGIN_TYPE = sensorgestures -PLUGIN_CLASS_NAME = QShakeSensorGesturePlugin -PLUGIN_EXTENDS = - -load(qt_plugin) - # Input HEADERS += qshakesensorgestureplugin.h \ qshakerecognizer.h @@ -15,3 +10,7 @@ SOURCES += qshakesensorgestureplugin.cpp \ OTHER_FILES += \ plugin.json +PLUGIN_TYPE = sensorgestures +PLUGIN_CLASS_NAME = QShakeSensorGesturePlugin +PLUGIN_EXTENDS = - +load(qt_plugin) diff --git a/src/plugins/sensors/android/src/src.pro b/src/plugins/sensors/android/src/src.pro index 23a6bea..8366944 100644 --- a/src/plugins/sensors/android/src/src.pro +++ b/src/plugins/sensors/android/src/src.pro @@ -1,9 +1,6 @@ TARGET = qtsensors_android -QT = sensors core -PLUGIN_TYPE = sensors -PLUGIN_CLASS_NAME = QCounterGesturePlugin -load(qt_plugin) +QT = sensors core # STATICPLUGIN needed because there's a Q_IMPORT_PLUGIN in main.cpp # Yes, the plugin imports itself statically @@ -36,3 +33,7 @@ SOURCES = \ androidlight.cpp OTHER_FILES = plugin.json + +PLUGIN_TYPE = sensors +PLUGIN_CLASS_NAME = QCounterGesturePlugin +load(qt_plugin) diff --git a/src/plugins/sensors/dummy/dummy.pro b/src/plugins/sensors/dummy/dummy.pro index 93f54dc..b4ef2fd 100644 --- a/src/plugins/sensors/dummy/dummy.pro +++ b/src/plugins/sensors/dummy/dummy.pro @@ -1,10 +1,6 @@ TARGET = qtsensors_dummy QT = sensors core -PLUGIN_TYPE = sensors -PLUGIN_CLASS_NAME = dummySensorPlugin -load(qt_plugin) - HEADERS += dummycommon.h\ dummyaccelerometer.h\ dummylightsensor.h @@ -17,3 +13,7 @@ SOURCES += dummycommon.cpp\ OTHER_FILES = plugin.json unix:!mac:!qnx:!android:LIBS+=-lrt + +PLUGIN_TYPE = sensors +PLUGIN_CLASS_NAME = dummySensorPlugin +load(qt_plugin) diff --git a/src/plugins/sensors/generic/generic.pro b/src/plugins/sensors/generic/generic.pro index cdb9300..cf87ccf 100644 --- a/src/plugins/sensors/generic/generic.pro +++ b/src/plugins/sensors/generic/generic.pro @@ -1,10 +1,6 @@ TARGET = qtsensors_generic QT = core sensors -PLUGIN_TYPE = sensors -PLUGIN_CLASS_NAME = genericSensorPlugin -load(qt_plugin) - HEADERS += generictiltsensor.h SOURCES += main.cpp\ @@ -27,3 +23,7 @@ DEFINES += QTSENSORS_GENERICORIENTATIONSENSOR QTSENSORS_GENERICALSSENSOR } OTHER_FILES = plugin.json + +PLUGIN_TYPE = sensors +PLUGIN_CLASS_NAME = genericSensorPlugin +load(qt_plugin) diff --git a/src/plugins/sensors/ios/ios.pro b/src/plugins/sensors/ios/ios.pro index 4197b14..17ff009 100644 --- a/src/plugins/sensors/ios/ios.pro +++ b/src/plugins/sensors/ios/ios.pro @@ -1,10 +1,6 @@ TARGET = qtsensors_ios QT = core sensors -PLUGIN_TYPE = sensors -PLUGIN_CLASS_NAME = IOSSensorPlugin -load(qt_plugin) - OTHER_FILES = plugin.json HEADERS += iosaccelerometer.h \ @@ -23,3 +19,7 @@ OBJECTIVE_SOURCES += main.mm \ iosproximitysensor.mm LIBS += -framework UIKit -framework CoreMotion -framework CoreLocation + +PLUGIN_TYPE = sensors +PLUGIN_CLASS_NAME = IOSSensorPlugin +load(qt_plugin) diff --git a/src/plugins/sensors/linux/linux.pro b/src/plugins/sensors/linux/linux.pro index 636bd1b..33706e7 100644 --- a/src/plugins/sensors/linux/linux.pro +++ b/src/plugins/sensors/linux/linux.pro @@ -1,13 +1,13 @@ TARGET = qtsensors_linuxsys QT = core sensors -PLUGIN_TYPE = sensors -PLUGIN_CLASS_NAME = LinuxSensorPlugin -load(qt_plugin) - OTHER_FILES = plugin.json !android:LIBS += -lrt HEADERS += linuxsysaccelerometer.h SOURCES += linuxsysaccelerometer.cpp \ main.cpp + +PLUGIN_TYPE = sensors +PLUGIN_CLASS_NAME = LinuxSensorPlugin +load(qt_plugin) diff --git a/src/plugins/sensors/sensorfw/sensorfw.pro b/src/plugins/sensors/sensorfw/sensorfw.pro index 6c1408b..b30b362 100644 --- a/src/plugins/sensors/sensorfw/sensorfw.pro +++ b/src/plugins/sensors/sensorfw/sensorfw.pro @@ -1,10 +1,6 @@ TARGET = qtsensors_sensorfw QT = core sensors network dbus -PLUGIN_TYPE = sensors -PLUGIN_CLASS_NAME = sensorfwSensorPlugin -load(qt_plugin) - include(sensorfw.pri) @@ -16,3 +12,7 @@ CONFIGFILES.path = /etc/xdg/QtProject/ INSTALLS += CONFIGFILES OTHER_FILES = plugin.json + +PLUGIN_TYPE = sensors +PLUGIN_CLASS_NAME = sensorfwSensorPlugin +load(qt_plugin) diff --git a/src/plugins/sensors/simulator/simulator.pro b/src/plugins/sensors/simulator/simulator.pro index b110137..ac8ea50 100644 --- a/src/plugins/sensors/simulator/simulator.pro +++ b/src/plugins/sensors/simulator/simulator.pro @@ -1,9 +1,5 @@ TARGET = qtsensors_simulator -PLUGIN_TYPE = sensors -PLUGIN_CLASS_NAME = SimulatorSensorPlugin -load(qt_plugin) - QT=core gui network sensors simulator HEADERS += \ @@ -30,3 +26,7 @@ SOURCES += \ main.cpp OTHER_FILES = plugin.json + +PLUGIN_TYPE = sensors +PLUGIN_CLASS_NAME = SimulatorSensorPlugin +load(qt_plugin) diff --git a/src/plugins/sensors/winrt/winrt.pro b/src/plugins/sensors/winrt/winrt.pro index 67ae530..21996fd 100644 --- a/src/plugins/sensors/winrt/winrt.pro +++ b/src/plugins/sensors/winrt/winrt.pro @@ -1,10 +1,6 @@ TARGET = qtsensors_winrt QT = sensors core core_private -PLUGIN_TYPE = sensors -PLUGIN_CLASS_NAME = WinRtSensorPlugin -load(qt_plugin) - HEADERS += \ winrtaccelerometer.h \ winrtambientlightsensor.h \ @@ -25,3 +21,7 @@ SOURCES += \ winrtgyroscope.cpp OTHER_FILES = plugin.json + +PLUGIN_TYPE = sensors +PLUGIN_CLASS_NAME = WinRtSensorPlugin +load(qt_plugin) diff --git a/src/sensors/sensors.pro b/src/sensors/sensors.pro index a7f60e1..3e8754d 100644 --- a/src/sensors/sensors.pro +++ b/src/sensors/sensors.pro @@ -18,11 +18,6 @@ ANDROID_JAR_DEPENDENCIES = \ jar/QtSensors.jar:org.qtproject.qt5.android.sensors.QtSensors ANDROID_LIB_DEPENDENCIES = \ plugins/sensors/libqtsensors_android.so -MODULE_PLUGIN_TYPES = \ - sensors \ - sensorgestures - -load(qt_module) PUBLIC_HEADERS += \ qsensorbackend.h\ @@ -87,3 +82,8 @@ for(s,SENSORS) { } HEADERS += $$PUBLIC_HEADERS $$PRIVATE_HEADERS $$GESTURE_HEADERS + +MODULE_PLUGIN_TYPES = \ + sensors \ + sensorgestures +load(qt_module) |