diff options
author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2012-10-24 15:38:54 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-11-02 18:13:31 +0100 |
commit | 980ce3eb2a9da3a4b20993e221889597d18d0a0d (patch) | |
tree | 0f4bf83fe1c39508a23f8e0263a79734caa29caa | |
parent | eee645574f6d3e265372a1af249bd62a2506c32a (diff) | |
download | qtsensors-980ce3eb2a9da3a4b20993e221889597d18d0a0d.tar.gz |
adjust to qt_plugin.prf and qml_plugin.prf changes
DESTDIR and INSTALLS+=target are set up automatically now, but
PLUGIN_TYPE needs to be defined.
this contains a nasty hack for examples, as we don't want users to use
the internal prf files.
Change-Id: I9e854e7ff6183e19801998ff7157a279b97b2be4
Reviewed-by: Lorn Potter <lorn.potter@gmail.com>
-rw-r--r-- | examples/sensors/qmlsensorgestures/plugin/plugin.pro | 18 | ||||
-rw-r--r-- | src/imports/sensors/sensors.pro | 11 | ||||
-rw-r--r-- | src/plugins/sensorgestures/qtsensors/qtsensors.pro | 6 | ||||
-rw-r--r-- | src/plugins/sensorgestures/shake/shake.pro | 6 | ||||
-rw-r--r-- | src/plugins/sensors/blackberry/blackberry.pro | 6 | ||||
-rw-r--r-- | src/plugins/sensors/dummy/dummy.pro | 6 | ||||
-rw-r--r-- | src/plugins/sensors/generic/generic.pro | 6 | ||||
-rw-r--r-- | src/plugins/sensors/linux/linux.pro | 6 | ||||
-rw-r--r-- | src/plugins/sensors/simulator/simulator.pro | 7 | ||||
-rw-r--r-- | tests/auto/qsensorgestures/plugins/test1/test1.pro | 9 |
10 files changed, 23 insertions, 58 deletions
diff --git a/examples/sensors/qmlsensorgestures/plugin/plugin.pro b/examples/sensors/qmlsensorgestures/plugin/plugin.pro index 2003e91..9d5f26b 100644 --- a/examples/sensors/qmlsensorgestures/plugin/plugin.pro +++ b/examples/sensors/qmlsensorgestures/plugin/plugin.pro @@ -1,10 +1,19 @@ +QT += sensors +TARGET = qtsensorgestures_counterplugin + +QTDIR_build { +# This is only for the Qt build. Do not use externally. We mean it. +PLUGIN_TYPE = sensorgestures +load(qt_plugin) +} else { + TEMPLATE = lib CONFIG += plugin -TARGET = qtsensorgestures_counterplugin +target.path += $$[QT_INSTALL_PLUGINS]/sensorgestures +INSTALLS += target -QT += sensors -DESTDIR = $$QT.sensors.plugins/sensorgestures +} HEADERS += \ qcountergestureplugin.h \ @@ -13,9 +22,6 @@ SOURCES += \ qcountergestureplugin.cpp \ qcounterrecognizer.cpp -target.path += $$[QT_INSTALL_PLUGINS]/sensorgestures -INSTALLS += target - OTHER_FILES += \ plugin.json diff --git a/src/imports/sensors/sensors.pro b/src/imports/sensors/sensors.pro index d479922..210ceac 100644 --- a/src/imports/sensors/sensors.pro +++ b/src/imports/sensors/sensors.pro @@ -3,8 +3,6 @@ TARGET = declarative_sensors TARGETPATH = QtSensors IMPORT_VERSION = 5.0 # Doesn't matter, as long as it's a valid version?! -include(qsensorsimport.pri) - QT += qml sensors sensors-private HEADERS += \ @@ -43,15 +41,6 @@ SOURCES += sensors.cpp \ qmltiltsensor.cpp \ qmlsensorgesture.cpp - -DESTDIR = $$QT.sensors.imports/$$TARGETPATH -target.path = $$[QT_INSTALL_IMPORTS]/$$TARGETPATH - -qmldir.files += $$PWD/qmldir $$PWD/plugin.qmltypes -qmldir.path += $$[QT_INSTALL_IMPORTS]/$$TARGETPATH - -INSTALLS += target qmldir - load(qml_plugin) OTHER_FILES += \ diff --git a/src/plugins/sensorgestures/qtsensors/qtsensors.pro b/src/plugins/sensorgestures/qtsensors/qtsensors.pro index 66e0ded..6883178 100644 --- a/src/plugins/sensorgestures/qtsensors/qtsensors.pro +++ b/src/plugins/sensorgestures/qtsensors/qtsensors.pro @@ -1,10 +1,9 @@ TARGET = qtsensorgestures_plugin QT = core sensors +PLUGIN_TYPE = sensorgestures load(qt_plugin) -DESTDIR = $$QT.sensors.plugins/sensorgestures - # Input HEADERS += qtsensorgestureplugin.h \ qcoversensorgesturerecognizer.h \ @@ -30,9 +29,6 @@ SOURCES += qtsensorgestureplugin.cpp \ qwhipsensorgesturerecognizer.cpp \ qtsensorgesturesensorhandler.cpp -target.path += $$[QT_INSTALL_PLUGINS]/sensorgestures -INSTALLS += target - OTHER_FILES += \ plugin.json diff --git a/src/plugins/sensorgestures/shake/shake.pro b/src/plugins/sensorgestures/shake/shake.pro index f0333c6..82031c6 100644 --- a/src/plugins/sensorgestures/shake/shake.pro +++ b/src/plugins/sensorgestures/shake/shake.pro @@ -1,19 +1,15 @@ TARGET = qtsensorgestures_shakeplugin QT = core sensors +PLUGIN_TYPE = sensorgestures load(qt_plugin) -DESTDIR = $$QT.sensors.plugins/sensorgestures - # Input HEADERS += qshakesensorgestureplugin.h \ qshakerecognizer.h SOURCES += qshakesensorgestureplugin.cpp \ qshakerecognizer.cpp -target.path += $$[QT_INSTALL_PLUGINS]/sensorgestures -INSTALLS += target - OTHER_FILES += \ plugin.json diff --git a/src/plugins/sensors/blackberry/blackberry.pro b/src/plugins/sensors/blackberry/blackberry.pro index 2daa98c..73027c2 100644 --- a/src/plugins/sensors/blackberry/blackberry.pro +++ b/src/plugins/sensors/blackberry/blackberry.pro @@ -2,6 +2,7 @@ TARGET = qtsensors_blackberry QT = sensors core DEFINES += QT_NO_CAST_FROM_ASCII QT_NO_CAST_TO_ASCII +PLUGIN_TYPE = sensors load(qt_plugin) config_bbsensor_header { @@ -11,8 +12,6 @@ config_bbsensor_compass { DEFINES += HAVE_COMPASS_SENSOR } -DESTDIR = $$QT.sensors.plugins/sensors - HEADERS += bbsensorbackend.h \ bbaccelerometer.h \ bbaltimeter.h \ @@ -49,6 +48,3 @@ SOURCES += bbsensorbackend.cpp \ main.cpp OTHER_FILES = plugin.json - -target.path += $$[QT_INSTALL_PLUGINS]/sensors -INSTALLS += target diff --git a/src/plugins/sensors/dummy/dummy.pro b/src/plugins/sensors/dummy/dummy.pro index f722a09..b97bd9c 100644 --- a/src/plugins/sensors/dummy/dummy.pro +++ b/src/plugins/sensors/dummy/dummy.pro @@ -1,10 +1,9 @@ TARGET = qtsensors_dummy QT = sensors core +PLUGIN_TYPE = sensors load(qt_plugin) -DESTDIR = $$QT.sensors.plugins/sensors - HEADERS += dummycommon.h\ dummyaccelerometer.h\ dummylightsensor.h @@ -17,6 +16,3 @@ SOURCES += dummycommon.cpp\ OTHER_FILES = plugin.json unix:!mac:!qnx:LIBS+=-lrt - -target.path += $$[QT_INSTALL_PLUGINS]/sensors -INSTALLS += target diff --git a/src/plugins/sensors/generic/generic.pro b/src/plugins/sensors/generic/generic.pro index 22d7c13..2d4f9f9 100644 --- a/src/plugins/sensors/generic/generic.pro +++ b/src/plugins/sensors/generic/generic.pro @@ -1,10 +1,9 @@ TARGET = qtsensors_generic QT = core sensors +PLUGIN_TYPE = sensors load(qt_plugin) -DESTDIR = $$QT.sensors.plugins/sensors - HEADERS += genericorientationsensor.h\ genericrotationsensor.h\ genericalssensor.h\ @@ -17,6 +16,3 @@ SOURCES += genericorientationsensor.cpp\ generictiltsensor.cpp OTHER_FILES = plugin.json - -target.path += $$[QT_INSTALL_PLUGINS]/sensors -INSTALLS += target diff --git a/src/plugins/sensors/linux/linux.pro b/src/plugins/sensors/linux/linux.pro index 48fc348..7546728 100644 --- a/src/plugins/sensors/linux/linux.pro +++ b/src/plugins/sensors/linux/linux.pro @@ -1,16 +1,12 @@ TARGET = qtsensors_linuxsys QT = core sensors +PLUGIN_TYPE = sensors load(qt_plugin) -DESTDIR = $$QT.sensors.plugins/sensors - OTHER_FILES = plugin.json LIBS += -lrt HEADERS += linuxsysaccelerometer.h SOURCES += linuxsysaccelerometer.cpp \ main.cpp - -target.path += $$[QT_INSTALL_PLUGINS]/sensors -INSTALLS += target diff --git a/src/plugins/sensors/simulator/simulator.pro b/src/plugins/sensors/simulator/simulator.pro index 706c3a0..2c1d933 100644 --- a/src/plugins/sensors/simulator/simulator.pro +++ b/src/plugins/sensors/simulator/simulator.pro @@ -1,13 +1,10 @@ TARGET = qtsensors_simulator -load(qt_plugin) -DESTDIR = $$QT.sensors.plugins/sensors +PLUGIN_TYPE = sensors +load(qt_plugin) QT=core gui network sensors simulator -target.path += $$[QT_INSTALL_PLUGINS]/sensors -INSTALLS += target - HEADERS += \ simulatorcommon.h\ simulatoraccelerometer.h\ diff --git a/tests/auto/qsensorgestures/plugins/test1/test1.pro b/tests/auto/qsensorgestures/plugins/test1/test1.pro index 17fc6b1..e0dab44 100644 --- a/tests/auto/qsensorgestures/plugins/test1/test1.pro +++ b/tests/auto/qsensorgestures/plugins/test1/test1.pro @@ -1,10 +1,9 @@ -TEMPLATE = lib -CONFIG += plugin - TARGET = qtsensorgestures_testplugin1 QT += sensors sensorgestures -DESTDIR = $$QT.sensorgestures.plugins/sensorgestures + +PLUGIN_TYPE = sensorgestures +load(qt_plugin) # Input HEADERS += qtestsensorgestureplugindup_p.h \ @@ -14,6 +13,4 @@ SOURCES += qtestsensorgestureplugindup.cpp \ qtestrecognizerdup.cpp \ qtest2recognizerduo.cpp -target.path += $$[QT_INSTALL_PLUGINS]/sensorgestures -INSTALLS += target DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 |