diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-01-11 09:14:06 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-01-11 09:15:03 +0100 |
| commit | 6a0e2376a14c77585888373099109d51a08bd74f (patch) | |
| tree | e4ac226f869351d475be7d1f26d005d0db3c42f7 /src/qt/bitcoin.cpp | |
| parent | 62e9d774966c9f4344f0356c59ddadcc5ff17212 (diff) | |
| parent | 42cc96737ca05a3b539ce5d1a734a7a62407d31c (diff) | |
Merge pull request #3346
42cc967 qt5: fix typo causing broken selection logic (Cory Fields)
371f3f6 qt5: fix --with-qt with no arguments (Cory Fields)
2691cbc qt5: Force macports default include path to be searched last (Cory Fields)
8b0f608 qt5: tests: Make sure static plugin symbols are pulled in (Cory Fields)
47ffb50 qt5: Use QT_SELECT for debian-based distros. (Cory Fields)
60dc589 qt5: Use the info gleaned from configure for plugin importing (Cory Fields)
c8ba8ef qt5: split out qt config and add qt5 support (Cory Fields)
c614bd7 qt5: fix a build issue with osx and qtdbus (Cory Fields)
328bdb1 qt5: Ensure correct link order (Cory Fields)
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 |