From 45483bfae4f59ab92be22007cf49d9d7eee8a16c Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Wed, 24 Oct 2012 15:40:39 +0200 Subject: adjust to qt_plugin.prf changes DESTDIR and INSTALLS+=target are set up automatically now, but PLUGIN_TYPE needs to be defined. Change-Id: Ib813d8bc48dad023322c476ca6f93bae4effa62a Reviewed-by: Joerg Bornemann --- src/plugins/iconengines/svgiconengine/svgiconengine.pro | 6 ++---- src/plugins/imageformats/svg/svg.pro | 6 ++---- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/src/plugins/iconengines/svgiconengine/svgiconengine.pro b/src/plugins/iconengines/svgiconengine/svgiconengine.pro index 0e1a3c2..f80b23b 100644 --- a/src/plugins/iconengines/svgiconengine/svgiconengine.pro +++ b/src/plugins/iconengines/svgiconengine/svgiconengine.pro @@ -1,4 +1,6 @@ TARGET = qsvgicon + +PLUGIN_TYPE = iconengines load(qt_plugin) HEADERS += qsvgiconengine.h @@ -6,7 +8,3 @@ SOURCES += main.cpp \ qsvgiconengine.cpp OTHER_FILES += qsvgiconengine.json QT += xml svg gui - -DESTDIR = $$QT.svg.plugins/iconengines -target.path += $$[QT_INSTALL_PLUGINS]/iconengines -INSTALLS += target diff --git a/src/plugins/imageformats/svg/svg.pro b/src/plugins/imageformats/svg/svg.pro index 9645f6e..cdcb084 100644 --- a/src/plugins/imageformats/svg/svg.pro +++ b/src/plugins/imageformats/svg/svg.pro @@ -1,11 +1,9 @@ TARGET = qsvg + +PLUGIN_TYPE = imageformats load(qt_plugin) HEADERS += qsvgiohandler.h SOURCES += main.cpp \ qsvgiohandler.cpp QT += xml svg - -DESTDIR = $$QT.svg.plugins/imageformats -target.path += $$[QT_INSTALL_PLUGINS]/imageformats -INSTALLS += target -- cgit v1.2.1