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>

7 files changed, 8 insertions, 35 deletions

diff --git a/src/plugins/sensorgestures/qtsensors/qtsensors.pro b/src/plugins/sensorgestures/qtsensors/qtsensors.pro
index 66e0ded1..68831786 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 f0333c67..82031c62 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 2daa98cb..73027c20 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 f722a09e..b97bd9ce 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 22d7c133..2d4f9f9f 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 48fc3483..7546728f 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 706c3a04..2c1d933f 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\