diff options
| author | Cory Fields <cory-nospam-@coryfields.com> | 2013-12-02 16:54:19 -0500 |
|---|---|---|
| committer | Cory Fields <cory-nospam-@coryfields.com> | 2014-01-10 16:30:33 -0500 |
| commit | 60dc589477f963d9848be7bb7fb0589a30deb912 (patch) | |
| tree | 949eb48e9dca0fd3874eb65bc0baa692803a82a8 /src/qt/bitcoin.cpp | |
| parent | c8ba8ef65459e5db0cb787c39091c45914bbb2fb (diff) | |
| download | bitcoin-60dc589477f963d9848be7bb7fb0589a30deb912.tar.xz | |
qt5: Use the info gleaned from configure for plugin importing
Diffstat (limited to 'src/qt/bitcoin.cpp')
| -rw-r--r-- | src/qt/bitcoin.cpp | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/src/qt/bitcoin.cpp b/src/qt/bitcoin.cpp index d78f6fab75..794d12f69b 100644 --- a/src/qt/bitcoin.cpp +++ b/src/qt/bitcoin.cpp @@ -2,6 +2,7 @@ // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. +#include "bitcoin-config.h" #include "bitcoingui.h" #include "clientmodel.h" @@ -30,19 +31,22 @@ #include <QTimer> #include <QTranslator> -#if QT_VERSION < 0x050000 -#include <QTextCodec> -#endif - -#if defined(BITCOIN_NEED_QT_PLUGINS) && !defined(_BITCOIN_QT_PLUGINS_INCLUDED) -#define _BITCOIN_QT_PLUGINS_INCLUDED -#define __INSURE__ +#if defined(QT_STATICPLUGIN) #include <QtPlugin> +#if QT_VERSION < 0x050000 Q_IMPORT_PLUGIN(qcncodecs) Q_IMPORT_PLUGIN(qjpcodecs) Q_IMPORT_PLUGIN(qtwcodecs) Q_IMPORT_PLUGIN(qkrcodecs) Q_IMPORT_PLUGIN(qtaccessiblewidgets) +#else +Q_IMPORT_PLUGIN(AccessibleFactory) +Q_IMPORT_PLUGIN(QWindowsIntegrationPlugin); +#endif +#endif + +#if QT_VERSION < 0x050000 +#include <QTextCodec> #endif // Declare meta types used for QMetaObject::invokeMethod |