Skip to content

Commit 60dc589

Browse files
committed
qt5: Use the info gleaned from configure for plugin importing
1 parent c8ba8ef commit 60dc589

File tree

1 file changed

+11
-7
lines changed

1 file changed

+11
-7
lines changed

src/qt/bitcoin.cpp

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
// Distributed under the MIT/X11 software license, see the accompanying
33
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
44

5+
#include "bitcoin-config.h"
56
#include "bitcoingui.h"
67

78
#include "clientmodel.h"
@@ -30,19 +31,22 @@
3031
#include <QTimer>
3132
#include <QTranslator>
3233

33-
#if QT_VERSION < 0x050000
34-
#include <QTextCodec>
35-
#endif
36-
37-
#if defined(BITCOIN_NEED_QT_PLUGINS) && !defined(_BITCOIN_QT_PLUGINS_INCLUDED)
38-
#define _BITCOIN_QT_PLUGINS_INCLUDED
39-
#define __INSURE__
34+
#if defined(QT_STATICPLUGIN)
4035
#include <QtPlugin>
36+
#if QT_VERSION < 0x050000
4137
Q_IMPORT_PLUGIN(qcncodecs)
4238
Q_IMPORT_PLUGIN(qjpcodecs)
4339
Q_IMPORT_PLUGIN(qtwcodecs)
4440
Q_IMPORT_PLUGIN(qkrcodecs)
4541
Q_IMPORT_PLUGIN(qtaccessiblewidgets)
42+
#else
43+
Q_IMPORT_PLUGIN(AccessibleFactory)
44+
Q_IMPORT_PLUGIN(QWindowsIntegrationPlugin);
45+
#endif
46+
#endif
47+
48+
#if QT_VERSION < 0x050000
49+
#include <QTextCodec>
4650
#endif
4751

4852
// Declare meta types used for QMetaObject::invokeMethod

0 commit comments

Comments
 (0)