Optionally include additional QT plugins when required to build.

diff --git a/bitcoin-qt.pro b/bitcoin-qt.pro
index 473fb27780199bc0bb363418e8104193b388b812..e7e10f7203eb108e11b2eabe92f8dbe8a3b57589 100644 (file)
--- a/bitcoin-qt.pro
+++ b/bitcoin-qt.pro
@@ -47,6 +47,11 @@ contains(USE_SSL, 1) {
     DEFINES += USE_SSL
 }
 
+contains(BITCOIN_NEED_QT_PLUGINS, 1) {
+    DEFINES += BITCOIN_NEED_QT_PLUGINS
+    QTPLUGIN += qcncodecs qjpcodecs qtwcodecs qkrcodecs
+}
+
 # for extra security against potential buffer overflows
 QMAKE_CXXFLAGS += -fstack-protector 
 QMAKE_LFLAGS += -fstack-protector

diff --git a/src/init.cpp b/src/init.cpp
index 28be7ef7c0aa503a2c10b543e4cc405240285294..d6e153285edd437b2f1c77c5d88ca8295eeb504c 100644 (file)
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -12,6 +12,16 @@
 #include <boost/filesystem/fstream.hpp>
 #include <boost/interprocess/sync/file_lock.hpp>
 
+#if defined(BITCOIN_NEED_QT_PLUGINS) && !defined(_BITCOIN_QT_PLUGINS_INCLUDED)
+#define _BITCOIN_QT_PLUGINS_INCLUDED
+#define __INSURE__
+#include <QtPlugin>
+Q_IMPORT_PLUGIN(qcncodecs)
+Q_IMPORT_PLUGIN(qjpcodecs)
+Q_IMPORT_PLUGIN(qtwcodecs)
+Q_IMPORT_PLUGIN(qkrcodecs)
+#endif
+
 using namespace std;
 using namespace boost;