Use new plugin system in QtImageFormats.

Change-Id: Ib1d37b12d35db19f3b12d1881d29d3e0154d414d
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>

9 files changed, 28 insertions, 9 deletions

diff --git a/src/plugins/imageformats/mng/main.cpp b/src/plugins/imageformats/mng/main.cpp
index 47e659b..48a50f2 100644
--- a/src/plugins/imageformats/mng/main.cpp
+++ b/src/plugins/imageformats/mng/main.cpp
@@ -56,7 +56,10 @@ QT_BEGIN_NAMESPACE
 
 class QMngPlugin : public QImageIOPlugin
 {
-    public:
+    Q_OBJECT
+    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QImageIOHandlerFactoryInterface" FILE "mng.json")
+
+public:
     QStringList keys() const;
     Capabilities capabilities(QIODevice *device, const QByteArray &format) const;
     QImageIOHandler *create(QIODevice *device, const QByteArray &format = QByteArray()) const;
@@ -90,9 +93,8 @@ QImageIOHandler *QMngPlugin::create(QIODevice *device, const QByteArray &format)
     return hand;
 }
 
-Q_EXPORT_STATIC_PLUGIN(QMngPlugin)
-Q_EXPORT_PLUGIN2(qmng, QMngPlugin)
-
 QT_END_NAMESPACE
 
+#include "main.moc"
+
 #endif // !QT_NO_IMAGEFORMATPLUGIN
diff --git a/src/plugins/imageformats/mng/mng.json b/src/plugins/imageformats/mng/mng.json
new file mode 100644
index 0000000..1083727
--- /dev/null
+++ b/src/plugins/imageformats/mng/mng.json
@@ -0,0 +1,3 @@
+{
+    "Keys": [ "mng" ]
+}
diff --git a/src/plugins/imageformats/mng/mng.pro b/src/plugins/imageformats/mng/mng.pro
index 1bac008..df5cb18 100644
--- a/src/plugins/imageformats/mng/mng.pro
+++ b/src/plugins/imageformats/mng/mng.pro
@@ -5,6 +5,7 @@ load(qt_plugin)
 
 HEADERS += qmnghandler_p.h
 SOURCES += qmnghandler.cpp
+OTHER_FILES += mng.json
 contains(QT_CONFIG, system-mng) {
         if(unix|win32-g++*):LIBS += -lmng
         else:win32:         LIBS += libmng.lib
diff --git a/src/plugins/imageformats/tga/main.cpp b/src/plugins/imageformats/tga/main.cpp
index 246c329..b4d259a 100644
--- a/src/plugins/imageformats/tga/main.cpp
+++ b/src/plugins/imageformats/tga/main.cpp
@@ -54,6 +54,9 @@ QT_BEGIN_NAMESPACE
 
 class QTgaPlugin : public QImageIOPlugin
 {
+    Q_OBJECT
+    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QImageIOHandlerFactoryInterface" FILE "tga.json")
+
 public:
     Capabilities capabilities(QIODevice * device, const QByteArray & format) const;
     QImageIOHandler * create(QIODevice * device, const QByteArray & format = QByteArray()) const;
@@ -88,8 +91,8 @@ QStringList QTgaPlugin::keys() const
     return QStringList() << QLatin1String("tga");
 }
 
-Q_EXPORT_PLUGIN2(qtga, QTgaPlugin)
-
 QT_END_NAMESPACE
 
+#include "main.moc"
+
 #endif /* QT_NO_IMAGEFORMATPLUGIN */
diff --git a/src/plugins/imageformats/tga/tga.json b/src/plugins/imageformats/tga/tga.json
new file mode 100644
index 0000000..c4d10e6
--- /dev/null
+++ b/src/plugins/imageformats/tga/tga.json
@@ -0,0 +1,3 @@
+{
+    "Keys": [ "tga" ]
+}
diff --git a/src/plugins/imageformats/tga/tga.pro b/src/plugins/imageformats/tga/tga.pro
index dc6c965..63b6f9c 100644
--- a/src/plugins/imageformats/tga/tga.pro
+++ b/src/plugins/imageformats/tga/tga.pro
@@ -5,6 +5,7 @@ HEADERS += qtgahandler.h \
     qtgafile.h
 SOURCES += qtgahandler.cpp \
     qtgafile.cpp
+OTHER_FILES += tga.json
 
 SOURCES += main.cpp
 
diff --git a/src/plugins/imageformats/tiff/main.cpp b/src/plugins/imageformats/tiff/main.cpp
index d0e5eb1..5324d9a 100644
--- a/src/plugins/imageformats/tiff/main.cpp
+++ b/src/plugins/imageformats/tiff/main.cpp
@@ -53,6 +53,9 @@ QT_BEGIN_NAMESPACE
 
 class QTiffPlugin : public QImageIOPlugin
 {
+    Q_OBJECT
+    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QImageIOHandlerFactoryInterface" FILE "tiff.json")
+
 public:
     Capabilities capabilities(QIODevice * device, const QByteArray & format) const;
     QImageIOHandler * create(QIODevice * device, const QByteArray & format = QByteArray()) const;
@@ -89,9 +92,8 @@ QStringList QTiffPlugin::keys() const
     return QStringList() << QLatin1String("tiff") << QLatin1String("tif");
 }
 
-Q_EXPORT_STATIC_PLUGIN(QTiffPlugin)
-Q_EXPORT_PLUGIN2(qtiff, QTiffPlugin)
-
 QT_END_NAMESPACE
 
+#include "main.moc"
+
 #endif /* QT_NO_IMAGEFORMATPLUGIN */
diff --git a/src/plugins/imageformats/tiff/tiff.json b/src/plugins/imageformats/tiff/tiff.json
new file mode 100644
index 0000000..53f5fc8
--- /dev/null
+++ b/src/plugins/imageformats/tiff/tiff.json
@@ -0,0 +1,3 @@
+{
+    "Keys": [ "tiff", "tif" ]
+}
diff --git a/src/plugins/imageformats/tiff/tiff.pro b/src/plugins/imageformats/tiff/tiff.pro
index d24745e..0c26019 100644
--- a/src/plugins/imageformats/tiff/tiff.pro
+++ b/src/plugins/imageformats/tiff/tiff.pro
@@ -5,6 +5,7 @@ load(qt_plugin)
 
 include(qtiffhandler.pri)
 SOURCES += main.cpp
+OTHER_FILES += tiff.json
 
 DESTDIR = $$QT.gui.plugins/imageformats
 target.path += $$[QT_INSTALL_PLUGINS]/imageformats