summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@digia.com>2014-04-07 17:32:24 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-04-09 10:51:16 +0200
commit2a503c28e4b9c9c05ee69e115f3530bb764844e3 (patch)
tree92b1cc05b61322fd4d07521f92ebfa70f9ec2e77
parent5bdeb53a9b1e2543539e637c72dfaf3b91fdb60c (diff)
add PLUGIN_CLASS_NAME declarations to plugin projects
needed for automatic static linking (and later deployment). the gesture plugins are excluded from the automation based on the assumption that they are usually not needed. the example and the test plugin are also excluded for obvious reasons. Change-Id: I7645aa0daf216ce430989e13d4380dbe6dd2bbd1 Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
-rw-r--r--examples/sensors/qmlsensorgestures/plugin/plugin.pro2
-rw-r--r--src/plugins/sensorgestures/qtsensors/qtsensors.pro2
-rw-r--r--src/plugins/sensorgestures/shake/shake.pro2
-rw-r--r--src/plugins/sensors/android/src/src.pro1
-rw-r--r--src/plugins/sensors/blackberry/blackberry.pro1
-rw-r--r--src/plugins/sensors/dummy/dummy.pro1
-rw-r--r--src/plugins/sensors/linux/linux.pro1
-rw-r--r--src/plugins/sensors/sensorfw/sensorfw.pro1
-rw-r--r--src/plugins/sensors/simulator/simulator.pro1
-rw-r--r--src/plugins/sensors/winrt/winrt.pro1
-rw-r--r--tests/auto/qsensorgestures/plugins/test1/test1.pro2
11 files changed, 15 insertions, 0 deletions
diff --git a/examples/sensors/qmlsensorgestures/plugin/plugin.pro b/examples/sensors/qmlsensorgestures/plugin/plugin.pro
index 9d5f26b9..23ece17b 100644
--- a/examples/sensors/qmlsensorgestures/plugin/plugin.pro
+++ b/examples/sensors/qmlsensorgestures/plugin/plugin.pro
@@ -4,6 +4,8 @@ TARGET = qtsensorgestures_counterplugin
QTDIR_build {
# This is only for the Qt build. Do not use externally. We mean it.
PLUGIN_TYPE = sensorgestures
+PLUGIN_CLASS_NAME = QCounterGesturePlugin
+PLUGIN_EXTENDS = -
load(qt_plugin)
} else {
diff --git a/src/plugins/sensorgestures/qtsensors/qtsensors.pro b/src/plugins/sensorgestures/qtsensors/qtsensors.pro
index de6c2780..3f8df039 100644
--- a/src/plugins/sensorgestures/qtsensors/qtsensors.pro
+++ b/src/plugins/sensorgestures/qtsensors/qtsensors.pro
@@ -2,6 +2,8 @@ TARGET = qtsensorgestures_plugin
QT = core sensors
PLUGIN_TYPE = sensorgestures
+PLUGIN_CLASS_NAME = QtSensorGesturePlugin
+PLUGIN_EXTENDS = -
load(qt_plugin)
# Input
diff --git a/src/plugins/sensorgestures/shake/shake.pro b/src/plugins/sensorgestures/shake/shake.pro
index 82031c62..d7d8f92e 100644
--- a/src/plugins/sensorgestures/shake/shake.pro
+++ b/src/plugins/sensorgestures/shake/shake.pro
@@ -2,6 +2,8 @@ TARGET = qtsensorgestures_shakeplugin
QT = core sensors
PLUGIN_TYPE = sensorgestures
+PLUGIN_CLASS_NAME = QShakeSensorGesturePlugin
+PLUGIN_EXTENDS = -
load(qt_plugin)
# Input
diff --git a/src/plugins/sensors/android/src/src.pro b/src/plugins/sensors/android/src/src.pro
index a184aae7..21423efb 100644
--- a/src/plugins/sensors/android/src/src.pro
+++ b/src/plugins/sensors/android/src/src.pro
@@ -2,6 +2,7 @@ TARGET = qtsensors_android
QT = sensors core
PLUGIN_TYPE = sensors
+PLUGIN_CLASS_NAME = QCounterGesturePlugin
load(qt_plugin)
# STATICPLUGIN needed because there's a Q_IMPORT_PLUGIN in main.cpp
diff --git a/src/plugins/sensors/blackberry/blackberry.pro b/src/plugins/sensors/blackberry/blackberry.pro
index 902239c4..8095cf16 100644
--- a/src/plugins/sensors/blackberry/blackberry.pro
+++ b/src/plugins/sensors/blackberry/blackberry.pro
@@ -3,6 +3,7 @@ QT = sensors core
DEFINES += QT_NO_CAST_FROM_ASCII QT_NO_CAST_TO_ASCII
PLUGIN_TYPE = sensors
+PLUGIN_CLASS_NAME = BbSensorPlugin
load(qt_plugin)
config_bbsensor_header {
diff --git a/src/plugins/sensors/dummy/dummy.pro b/src/plugins/sensors/dummy/dummy.pro
index f54588af..93f54dc0 100644
--- a/src/plugins/sensors/dummy/dummy.pro
+++ b/src/plugins/sensors/dummy/dummy.pro
@@ -2,6 +2,7 @@ TARGET = qtsensors_dummy
QT = sensors core
PLUGIN_TYPE = sensors
+PLUGIN_CLASS_NAME = dummySensorPlugin
load(qt_plugin)
HEADERS += dummycommon.h\
diff --git a/src/plugins/sensors/linux/linux.pro b/src/plugins/sensors/linux/linux.pro
index 25c4f2d9..636bd1b3 100644
--- a/src/plugins/sensors/linux/linux.pro
+++ b/src/plugins/sensors/linux/linux.pro
@@ -2,6 +2,7 @@ TARGET = qtsensors_linuxsys
QT = core sensors
PLUGIN_TYPE = sensors
+PLUGIN_CLASS_NAME = LinuxSensorPlugin
load(qt_plugin)
OTHER_FILES = plugin.json
diff --git a/src/plugins/sensors/sensorfw/sensorfw.pro b/src/plugins/sensors/sensorfw/sensorfw.pro
index f875f593..6c1408b2 100644
--- a/src/plugins/sensors/sensorfw/sensorfw.pro
+++ b/src/plugins/sensors/sensorfw/sensorfw.pro
@@ -2,6 +2,7 @@ TARGET = qtsensors_sensorfw
QT = core sensors network dbus
PLUGIN_TYPE = sensors
+PLUGIN_CLASS_NAME = sensorfwSensorPlugin
load(qt_plugin)
include(sensorfw.pri)
diff --git a/src/plugins/sensors/simulator/simulator.pro b/src/plugins/sensors/simulator/simulator.pro
index 2c1d933f..b110137b 100644
--- a/src/plugins/sensors/simulator/simulator.pro
+++ b/src/plugins/sensors/simulator/simulator.pro
@@ -1,6 +1,7 @@
TARGET = qtsensors_simulator
PLUGIN_TYPE = sensors
+PLUGIN_CLASS_NAME = SimulatorSensorPlugin
load(qt_plugin)
QT=core gui network sensors simulator
diff --git a/src/plugins/sensors/winrt/winrt.pro b/src/plugins/sensors/winrt/winrt.pro
index 494e1bf0..e9f3274f 100644
--- a/src/plugins/sensors/winrt/winrt.pro
+++ b/src/plugins/sensors/winrt/winrt.pro
@@ -2,6 +2,7 @@ TARGET = qtsensors_winrt
QT = sensors core
PLUGIN_TYPE = sensors
+PLUGIN_CLASS_NAME = WinRtSensorPlugin
load(qt_plugin)
HEADERS += \
diff --git a/tests/auto/qsensorgestures/plugins/test1/test1.pro b/tests/auto/qsensorgestures/plugins/test1/test1.pro
index e0dab443..f35af0d0 100644
--- a/tests/auto/qsensorgestures/plugins/test1/test1.pro
+++ b/tests/auto/qsensorgestures/plugins/test1/test1.pro
@@ -3,6 +3,8 @@ TARGET = qtsensorgestures_testplugin1
QT += sensors sensorgestures
PLUGIN_TYPE = sensorgestures
+PLUGIN_CLASS_NAME = QTestSensorGestureDupPlugin
+PLUGIN_EXTENDS = -
load(qt_plugin)
# Input