summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@digia.com>2012-10-24 15:30:27 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2012-11-01 22:37:23 +0100
commita0ec617b21d9ce0c562e8e7c0dc59bc4d08c509b (patch)
tree80246fed01b7ec17161eb650138faa4a61958975
parenta154a42fb2d2d8ff49bbc2d6b46fffc4a6a78927 (diff)
adjust to qt_plugin.prf changesv5.0.0-beta2
DESTDIR and INSTALLS+=target are set up automatically now, but PLUGIN_TYPE needs to be defined. Change-Id: I5dd40f4fb6bfc6723ed96241f41301b32393dd34 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
-rw-r--r--src/plugins/imageformats/mng/mng.pro6
-rw-r--r--src/plugins/imageformats/tga/tga.pro6
-rw-r--r--src/plugins/imageformats/tiff/tiff.pro6
-rw-r--r--src/plugins/imageformats/wbmp/wbmp.pro6
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