diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-07-27 12:28:38 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-07-27 12:28:42 +0200 |
| commit | f6850d58f7dd87de44dd25be0fc1067625fa8d3a (patch) | |
| tree | e1ba69f059982db0135a463af3eb266e37c40a60 /src | |
| parent | bfd807ff3287f391dcf184b755997fb9d0456a1a (diff) | |
| parent | 060b3d377b0a0d318f630beb7fe4d8f41b99981c (diff) | |
| download | bitcoin-f6850d58f7dd87de44dd25be0fc1067625fa8d3a.tar.xz | |
Merge pull request #6471
060b3d3 fixup: qt 5.5 snuck in another module that needs path hand-holding (Cory Fields)
ecd6a89 depends: make more qt flags explicit (Cory Fields)
ab67dd7 depends: bump to qt 5.5 (Cory Fields)
5189fe3 depends: split qt config options to separate lines (Jacob Welsh)
fe997df build: fix building against qt5.4/5.5 (Cory Fields)
Diffstat (limited to 'src')
| -rw-r--r-- | src/qt/bitcoin.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/qt/bitcoin.cpp b/src/qt/bitcoin.cpp index ec02c4be9f..8a78533420 100644 --- a/src/qt/bitcoin.cpp +++ b/src/qt/bitcoin.cpp @@ -59,7 +59,9 @@ Q_IMPORT_PLUGIN(qtwcodecs) Q_IMPORT_PLUGIN(qkrcodecs) Q_IMPORT_PLUGIN(qtaccessiblewidgets) #else +#if QT_VERSION < 0x050400 Q_IMPORT_PLUGIN(AccessibleFactory) +#endif #if defined(QT_QPA_PLATFORM_XCB) Q_IMPORT_PLUGIN(QXcbIntegrationPlugin); #elif defined(QT_QPA_PLATFORM_WINDOWS) |