diff options
| author | Matt Corallo <matt@bluematt.me> | 2011-10-07 10:46:56 -0400 |
|---|---|---|
| committer | Gavin Andresen <gavinandresen@gmail.com> | 2011-10-25 11:51:34 -0400 |
| commit | 5f2e76b8c777785a80f171d825cfddb213320f9a (patch) | |
| tree | 43e5f28b893d55e8d6fcb3b1ec932eaa1c9664b2 | |
| parent | 3f197952bdde524739c029e0d4a21af7ce069595 (diff) | |
| download | bitcoin-5f2e76b8c777785a80f171d825cfddb213320f9a.tar.xz | |
Optionally include additional QT plugins when required to build.
| -rw-r--r-- | bitcoin-qt.pro | 5 | ||||
| -rw-r--r-- | src/init.cpp | 10 |
2 files changed, 15 insertions, 0 deletions
diff --git a/bitcoin-qt.pro b/bitcoin-qt.pro index 473fb27780..e7e10f7203 100644 --- 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 28be7ef7c0..d6e153285e 100644 --- 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; |