adjust to qt_plugin.prf changes, part 2

DESTDIR and INSTALLS+=target are set up automatically now, but
PLUGIN_TYPE needs to be defined.

Change-Id: I2dab25a2527d376eaa37f233782ffe4b6a58b8f8
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>

diff --git a/src/plugins/accessible/quick/quick.pro b/src/plugins/accessible/quick/quick.pro
index c904867..eabe448 100644 (file)
--- a/src/plugins/accessible/quick/quick.pro
+++ b/src/plugins/accessible/quick/quick.pro
@@ -1,5 +1,4 @@
 TARGET  = qtaccessiblequick
-DESTDIR = $$QT.gui.plugins/accessible
 
 PLUGIN_TYPE = accessible
 load(qt_plugin)

diff --git a/src/plugins/accessible/shared/qaccessiblebase.pri b/src/plugins/accessible/shared/qaccessiblebase.pri
index 56a8a1c..061d154 100644 (file)
--- a/src/plugins/accessible/shared/qaccessiblebase.pri
+++ b/src/plugins/accessible/shared/qaccessiblebase.pri
@@ -1,6 +1,3 @@
-target.path     += $$[QT_INSTALL_PLUGINS]/accessible
-INSTALLS        += target
-
 INCLUDEPATH += $$PWD
 DEPENDPATH += $$PWD
 SOURCES += $$PWD/qqmlaccessible.cpp

diff --git a/src/plugins/qmltooling/qmldbg_ost/qmldbg_ost.pro b/src/plugins/qmltooling/qmldbg_ost/qmldbg_ost.pro
index 7f07cbe..6d486ec 100644 (file)
--- a/src/plugins/qmltooling/qmldbg_ost/qmldbg_ost.pro
+++ b/src/plugins/qmltooling/qmldbg_ost/qmldbg_ost.pro
@@ -4,8 +4,6 @@ QT       += qml network
 PLUGIN_TYPE = qmltooling
 load(qt_plugin)
 
-DESTDIR  = $$QT.qml.plugins/qmltooling
-
 SOURCES += \
     qmlostplugin.cpp \
     qostdevice.cpp
@@ -14,6 +12,3 @@ HEADERS += \
     qmlostplugin.h \
     qostdevice.h \
     usbostcomm.h
-
-target.path += $$[QT_INSTALL_PLUGINS]/qmltooling
-INSTALLS += target

diff --git a/src/plugins/qmltooling/qmldbg_qtquick2/qmldbg_qtquick2.pro b/src/plugins/qmltooling/qmldbg_qtquick2/qmldbg_qtquick2.pro
index ce74afd..6c672c2 100644 (file)
--- a/src/plugins/qmltooling/qmldbg_qtquick2/qmldbg_qtquick2.pro
+++ b/src/plugins/qmltooling/qmldbg_qtquick2/qmldbg_qtquick2.pro
@@ -4,8 +4,6 @@ QT       += qml-private quick-private core-private gui-private v8-private
 PLUGIN_TYPE = qmltooling
 load(qt_plugin)
 
-DESTDIR  = $$QT.qml.plugins/qmltooling
-
 INCLUDEPATH *= $$PWD $$PWD/../shared
 
 SOURCES += \
@@ -26,6 +24,3 @@ HEADERS += \
     inspecttool.h
 
 OTHER_FILES += qtquick2plugin.json
-
-target.path += $$[QT_INSTALL_PLUGINS]/qmltooling
-INSTALLS += target

diff --git a/src/plugins/qmltooling/qmldbg_tcp/qmldbg_tcp.pro b/src/plugins/qmltooling/qmldbg_tcp/qmldbg_tcp.pro
index fb07f5b..22241a3 100644 (file)
--- a/src/plugins/qmltooling/qmldbg_tcp/qmldbg_tcp.pro
+++ b/src/plugins/qmltooling/qmldbg_tcp/qmldbg_tcp.pro
@@ -4,8 +4,6 @@ QT       += qml-private network v8-private core-private
 PLUGIN_TYPE = qmltooling
 load(qt_plugin)
 
-DESTDIR = $$QT.qml.plugins/qmltooling
-
 SOURCES += \
     qtcpserverconnection.cpp \
     ../shared/qpacketprotocol.cpp
@@ -17,6 +15,3 @@ HEADERS += \
 INCLUDEPATH += ../shared
 
 OTHER_FILES += qtcpserverconnection.json
-
-target.path += $$[QT_INSTALL_PLUGINS]/qmltooling
-INSTALLS += target