From: Wladimir J. van der Laan <laanwj@gmail.com>
Date: Sat, 24 Mar 2012 15:52:43 +0000 (+0100)
Subject: move QT_PLUGINS stuff to qt main file, where it belongs
X-Git-Tag: v0.4.0-unstable~129^2~110^2~9
X-Git-Url: https://git.novaco.in/?a=commitdiff_plain;h=55f69a47002a1fc5bdf4e0c345e61ec955fa664b;hp=fc8c44e3d567a5a3cd1b373bd588015296a5a6f3;p=novacoin.git

move QT_PLUGINS stuff to qt main file, where it belongs
---

diff --git a/src/init.cpp b/src/init.cpp
index 8531b20..d04c7a2 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -13,17 +13,6 @@
 #include <boost/filesystem/convenience.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)
-Q_IMPORT_PLUGIN(qtaccessiblewidgets)
-#endif
-
 #ifdef WIN32
 #define strncasecmp strnicmp
 #endif
diff --git a/src/qt/bitcoin.cpp b/src/qt/bitcoin.cpp
index 6ee7fed..7384646 100644
--- a/src/qt/bitcoin.cpp
+++ b/src/qt/bitcoin.cpp
@@ -21,6 +21,17 @@
 
 #include <boost/interprocess/ipc/message_queue.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)
+Q_IMPORT_PLUGIN(qtaccessiblewidgets)
+#endif
+
 // Need a global reference for the notifications to find the GUI
 BitcoinGUI *guiref;
 QSplashScreen *splashref;