diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-07-18 11:38:24 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-07-18 11:39:18 +0200 |
| commit | 773c1f297b9bd3535ef4f8fc4abfa6715efb12cc (patch) | |
| tree | e7fe51447eda78cb4d311ee0cca0a10b0daf06fc /src/qt | |
| parent | d3cb2b8acfce36d359262b4afd7e7235eff106b0 (diff) | |
| parent | 2d89ea9781d25b887b7804ee0e5749fbe044f455 (diff) | |
| download | bitcoin-773c1f297b9bd3535ef4f8fc4abfa6715efb12cc.tar.xz | |
Merge pull request #4554
2d89ea9 build: fix whitespace in pkg-config variable (Cory Fields)
ab123ad build: allow linux and osx to build against static qt5 (Cory Fields)
Diffstat (limited to 'src/qt')
| -rw-r--r-- | src/qt/bitcoin.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/qt/bitcoin.cpp b/src/qt/bitcoin.cpp index 43466663fa..afd591efb2 100644 --- a/src/qt/bitcoin.cpp +++ b/src/qt/bitcoin.cpp @@ -53,7 +53,13 @@ Q_IMPORT_PLUGIN(qkrcodecs) Q_IMPORT_PLUGIN(qtaccessiblewidgets) #else Q_IMPORT_PLUGIN(AccessibleFactory) +#if defined(QT_QPA_PLATFORM_XCB) +Q_IMPORT_PLUGIN(QXcbIntegrationPlugin); +#elif defined(QT_QPA_PLATFORM_WINDOWS) Q_IMPORT_PLUGIN(QWindowsIntegrationPlugin); +#elif defined(QT_QPA_PLATFORM_COCOA) +Q_IMPORT_PLUGIN(QCocoaIntegrationPlugin); +#endif #endif #endif |