From 980ce3eb2a9da3a4b20993e221889597d18d0a0d Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Wed, 24 Oct 2012 15:38:54 +0200 Subject: 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 --- examples/sensors/qmlsensorgestures/plugin/plugin.pro | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) (limited to 'examples') diff --git a/examples/sensors/qmlsensorgestures/plugin/plugin.pro b/examples/sensors/qmlsensorgestures/plugin/plugin.pro index 2003e910..9d5f26b9 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 -- cgit v1.2.3