summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>2016-02-12 16:10:34 +0100
committerOswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>2016-02-25 16:51:22 +0000
commitbf5b49878d75d316f31225f76152e8381a3d5f0f (patch)
tree0add49b280b8bdc4ab1672b76f48b82009fbf9f5
parenteaeeacd1d0efdf1e65c1742240b2a8d5219d5b94 (diff)
consistently put {qt,qml}_{module,plugin} at the end of project files
this fixes static builds by ensuring that all dependencies are exported. Task-number: QTBUG-51071 Change-Id: I1970c3588d4ef3140adb655c01291e585b4f25b3 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
-rw-r--r--src/plugins/imageformats/dds/dds.pro8
-rw-r--r--src/plugins/imageformats/icns/icns.pro8
-rw-r--r--src/plugins/imageformats/jp2/jp2.pro8
-rw-r--r--src/plugins/imageformats/mng/mng.pro8
-rw-r--r--src/plugins/imageformats/tga/tga.pro8
-rw-r--r--src/plugins/imageformats/tiff/tiff.pro8
-rw-r--r--src/plugins/imageformats/wbmp/wbmp.pro8
-rw-r--r--src/plugins/imageformats/webp/webp.pro8
8 files changed, 32 insertions, 32 deletions
diff --git a/src/plugins/imageformats/dds/dds.pro b/src/plugins/imageformats/dds/dds.pro
index b645576..00e64cb 100644
--- a/src/plugins/imageformats/dds/dds.pro
+++ b/src/plugins/imageformats/dds/dds.pro
@@ -1,9 +1,5 @@
TARGET = qdds
-PLUGIN_TYPE = imageformats
-PLUGIN_CLASS_NAME = QDDSPlugin
-load(qt_plugin)
-
HEADERS += \
ddsheader.h \
qddshandler.h
@@ -14,3 +10,7 @@ SOURCES += \
qddshandler.cpp
OTHER_FILES += dds.json
+
+PLUGIN_TYPE = imageformats
+PLUGIN_CLASS_NAME = QDDSPlugin
+load(qt_plugin)
diff --git a/src/plugins/imageformats/icns/icns.pro b/src/plugins/imageformats/icns/icns.pro
index eb57df5..57da844 100644
--- a/src/plugins/imageformats/icns/icns.pro
+++ b/src/plugins/imageformats/icns/icns.pro
@@ -1,9 +1,5 @@
TARGET = qicns
-PLUGIN_TYPE = imageformats
-PLUGIN_CLASS_NAME = QICNSPlugin
-load(qt_plugin)
-
DEFINES += QT_NO_CAST_FROM_ASCII QT_NO_CAST_TO_ASCII
HEADERS += \
@@ -14,3 +10,7 @@ SOURCES += \
qicnshandler.cpp
OTHER_FILES += icns.json
+
+PLUGIN_TYPE = imageformats
+PLUGIN_CLASS_NAME = QICNSPlugin
+load(qt_plugin)
diff --git a/src/plugins/imageformats/jp2/jp2.pro b/src/plugins/imageformats/jp2/jp2.pro
index 864ec26..89b9c55 100644
--- a/src/plugins/imageformats/jp2/jp2.pro
+++ b/src/plugins/imageformats/jp2/jp2.pro
@@ -1,9 +1,9 @@
TARGET = qjp2
-PLUGIN_TYPE = imageformats
-PLUGIN_CLASS_NAME = QJp2Plugin
-load(qt_plugin)
-
include(qjp2handler.pri)
SOURCES += main.cpp
OTHER_FILES += jp2.json
+
+PLUGIN_TYPE = imageformats
+PLUGIN_CLASS_NAME = QJp2Plugin
+load(qt_plugin)
diff --git a/src/plugins/imageformats/mng/mng.pro b/src/plugins/imageformats/mng/mng.pro
index f4e79af..cd233c8 100644
--- a/src/plugins/imageformats/mng/mng.pro
+++ b/src/plugins/imageformats/mng/mng.pro
@@ -1,9 +1,9 @@
TARGET = qmng
-PLUGIN_TYPE = imageformats
-PLUGIN_CLASS_NAME = QMngPlugin
-load(qt_plugin)
-
include(qmnghandler.pri)
SOURCES += main.cpp
OTHER_FILES += mng.json
+
+PLUGIN_TYPE = imageformats
+PLUGIN_CLASS_NAME = QMngPlugin
+load(qt_plugin)
diff --git a/src/plugins/imageformats/tga/tga.pro b/src/plugins/imageformats/tga/tga.pro
index 242ded5..7a04c20 100644
--- a/src/plugins/imageformats/tga/tga.pro
+++ b/src/plugins/imageformats/tga/tga.pro
@@ -1,9 +1,5 @@
TARGET = qtga
-PLUGIN_TYPE = imageformats
-PLUGIN_CLASS_NAME = QTgaPlugin
-load(qt_plugin)
-
HEADERS += qtgahandler.h \
qtgafile.h
SOURCES += qtgahandler.cpp \
@@ -11,3 +7,7 @@ SOURCES += qtgahandler.cpp \
OTHER_FILES += tga.json
SOURCES += main.cpp
+
+PLUGIN_TYPE = imageformats
+PLUGIN_CLASS_NAME = QTgaPlugin
+load(qt_plugin)
diff --git a/src/plugins/imageformats/tiff/tiff.pro b/src/plugins/imageformats/tiff/tiff.pro
index 0f841ab..6174095 100644
--- a/src/plugins/imageformats/tiff/tiff.pro
+++ b/src/plugins/imageformats/tiff/tiff.pro
@@ -1,9 +1,5 @@
TARGET = qtiff
-PLUGIN_TYPE = imageformats
-PLUGIN_CLASS_NAME = QTiffPlugin
-load(qt_plugin)
-
HEADERS += qtiffhandler_p.h
SOURCES += main.cpp qtiffhandler.cpp
wince*: SOURCES += qfunctions_wince.cpp
@@ -15,3 +11,7 @@ config_libtiff {
} else {
include($$PWD/../../../3rdparty/libtiff.pri)
}
+
+PLUGIN_TYPE = imageformats
+PLUGIN_CLASS_NAME = QTiffPlugin
+load(qt_plugin)
diff --git a/src/plugins/imageformats/wbmp/wbmp.pro b/src/plugins/imageformats/wbmp/wbmp.pro
index 488a46b..f25c23c 100644
--- a/src/plugins/imageformats/wbmp/wbmp.pro
+++ b/src/plugins/imageformats/wbmp/wbmp.pro
@@ -1,11 +1,11 @@
TARGET = qwbmp
-PLUGIN_TYPE = imageformats
-PLUGIN_CLASS_NAME = QWbmpPlugin
-load(qt_plugin)
-
HEADERS += qwbmphandler_p.h
SOURCES += qwbmphandler.cpp
OTHER_FILES += wbmp.json
SOURCES += main.cpp
+
+PLUGIN_TYPE = imageformats
+PLUGIN_CLASS_NAME = QWbmpPlugin
+load(qt_plugin)
diff --git a/src/plugins/imageformats/webp/webp.pro b/src/plugins/imageformats/webp/webp.pro
index 850c35d..515bc3e 100644
--- a/src/plugins/imageformats/webp/webp.pro
+++ b/src/plugins/imageformats/webp/webp.pro
@@ -1,9 +1,5 @@
TARGET = qwebp
-PLUGIN_TYPE = imageformats
-PLUGIN_CLASS_NAME = QWebpPlugin
-load(qt_plugin)
-
HEADERS += qwebphandler_p.h
SOURCES += main.cpp qwebphandler.cpp
OTHER_FILES += webp.json
@@ -14,3 +10,7 @@ config_libwebp {
} else {
include($$PWD/../../../3rdparty/libwebp.pri)
}
+
+PLUGIN_TYPE = imageformats
+PLUGIN_CLASS_NAME = QWebpPlugin
+load(qt_plugin)