From 5433a7038bdfe407b6e16a23f5504cc8c1c212a1 Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Date: Mon, 29 Oct 2012 15:45:45 +0100
Subject: [PATCH] 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>
---
src/plugins/accessible/quick/quick.pro | 1 -
src/plugins/accessible/shared/qaccessiblebase.pri | 3 ---
src/plugins/qmltooling/qmldbg_ost/qmldbg_ost.pro | 5 -----
src/plugins/qmltooling/qmldbg_qtquick2/qmldbg_qtquick2.pro | 5 -----
src/plugins/qmltooling/qmldbg_tcp/qmldbg_tcp.pro | 5 -----
5 files changed, 19 deletions(-)
diff --git a/src/plugins/accessible/quick/quick.pro b/src/plugins/accessible/quick/quick.pro
index c904867ca2..eabe44848b 100644
--- 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 56a8a1c9ef..061d154277 100644
--- 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 7f07cbeafb..6d486ecc2f 100644
--- 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 ce74afd0ef..6c672c2417 100644
--- 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 fb07f5be57..22241a3560 100644
--- 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
--
GitLab