diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2012-03-24 16:52:43 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2012-04-04 08:46:12 +0200 |
| commit | 55f69a47002a1fc5bdf4e0c345e61ec955fa664b (patch) | |
| tree | 3fca23cba5429a55b9d8b773ce92d0818e45e06a | |
| parent | fc8c44e3d567a5a3cd1b373bd588015296a5a6f3 (diff) | |
move QT_PLUGINS stuff to qt main file, where it belongs
| -rw-r--r-- | src/init.cpp | 11 | ||||
| -rw-r--r-- | src/qt/bitcoin.cpp | 11 |
2 files changed, 11 insertions, 11 deletions
diff --git a/src/init.cpp b/src/init.cpp index 8531b2071a..d04c7a2dbd 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 6ee7fed5c9..738464668f 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; |