From a0ec617b21d9ce0c562e8e7c0dc59bc4d08c509b Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Wed, 24 Oct 2012 15:30:27 +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: I5dd40f4fb6bfc6723ed96241f41301b32393dd34 Reviewed-by: Joerg Bornemann --- src/plugins/imageformats/mng/mng.pro | 6 ++---- src/plugins/imageformats/tga/tga.pro | 6 ++---- src/plugins/imageformats/tiff/tiff.pro | 6 ++---- src/plugins/imageformats/wbmp/wbmp.pro | 6 ++---- 4 files changed, 8 insertions(+), 16 deletions(-) diff --git a/src/plugins/imageformats/mng/mng.pro b/src/plugins/imageformats/mng/mng.pro index 17e364f..63926f4 100644 --- a/src/plugins/imageformats/mng/mng.pro +++ b/src/plugins/imageformats/mng/mng.pro @@ -1,4 +1,6 @@ TARGET = qmng + +PLUGIN_TYPE = imageformats load(qt_plugin) HEADERS += qmnghandler_p.h @@ -13,7 +15,3 @@ config_libmng { } SOURCES += main.cpp - -DESTDIR = $$QT.gui.plugins/imageformats -target.path += $$[QT_INSTALL_PLUGINS]/imageformats -INSTALLS += target diff --git a/src/plugins/imageformats/tga/tga.pro b/src/plugins/imageformats/tga/tga.pro index 63b6f9c..c346088 100644 --- a/src/plugins/imageformats/tga/tga.pro +++ b/src/plugins/imageformats/tga/tga.pro @@ -1,4 +1,6 @@ TARGET = qtga + +PLUGIN_TYPE = imageformats load(qt_plugin) HEADERS += qtgahandler.h \ @@ -9,8 +11,4 @@ OTHER_FILES += tga.json SOURCES += main.cpp -DESTDIR = $$QT.gui.plugins/imageformats -target.path += $$[QT_INSTALL_PLUGINS]/imageformats -INSTALLS += target - symbian: TARGET.UID3=0x20031E99 diff --git a/src/plugins/imageformats/tiff/tiff.pro b/src/plugins/imageformats/tiff/tiff.pro index 6d306b7..cc9f93b 100644 --- a/src/plugins/imageformats/tiff/tiff.pro +++ b/src/plugins/imageformats/tiff/tiff.pro @@ -1,4 +1,6 @@ TARGET = qtiff + +PLUGIN_TYPE = imageformats load(qt_plugin) HEADERS += qtiffhandler_p.h @@ -11,7 +13,3 @@ config_libtiff { } else { include($$PWD/../../../3rdparty/libtiff.pri) } - -DESTDIR = $$QT.gui.plugins/imageformats -target.path += $$[QT_INSTALL_PLUGINS]/imageformats -INSTALLS += target diff --git a/src/plugins/imageformats/wbmp/wbmp.pro b/src/plugins/imageformats/wbmp/wbmp.pro index 6ec358f..7579f9c 100644 --- a/src/plugins/imageformats/wbmp/wbmp.pro +++ b/src/plugins/imageformats/wbmp/wbmp.pro @@ -1,4 +1,6 @@ TARGET = qwbmp + +PLUGIN_TYPE = imageformats load(qt_plugin) HEADERS += qwbmphandler_p.h @@ -6,7 +8,3 @@ SOURCES += qwbmphandler.cpp OTHER_FILES += wbmp.json SOURCES += main.cpp - -DESTDIR = $$QT.gui.plugins/imageformats -target.path += $$[QT_INSTALL_PLUGINS]/imageformats -INSTALLS += target -- cgit v1.2.3