diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2013-10-08 03:48:04 -0700 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2013-10-08 03:48:04 -0700 |
| commit | 26002aa444d4ee4986d623e0ad45cca02e803bc5 (patch) | |
| tree | ee4236f755b55a66f39d6d45356dd823f2ff6e58 /src | |
| parent | adae2f1819f536ab3e39bb2b4ae3ee772447eb79 (diff) | |
| parent | c7b1d6bbc76b6d9ff8727416f0d2cce0c0141b22 (diff) | |
| download | bitcoin-26002aa444d4ee4986d623e0ad45cca02e803bc5.tar.xz | |
Merge pull request #3068 from Diapolo/qt-icon
Bitcoin-Qt: ensure Qt icon is shown with Qt >= 5.0
Diffstat (limited to 'src')
| -rw-r--r-- | src/qt/bitcoingui.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp index 66b0d6ace0..23a221120f 100644 --- a/src/qt/bitcoingui.cpp +++ b/src/qt/bitcoingui.cpp @@ -235,7 +235,11 @@ void BitcoinGUI::createActions(bool fIsTestnet) aboutAction = new QAction(QIcon(":/icons/bitcoin_testnet"), tr("&About Bitcoin"), this); aboutAction->setStatusTip(tr("Show information about Bitcoin")); aboutAction->setMenuRole(QAction::AboutRole); +#if QT_VERSION < 0x050000 aboutQtAction = new QAction(QIcon(":/trolltech/qmessagebox/images/qtlogo-64.png"), tr("About &Qt"), this); +#else + aboutQtAction = new QAction(QIcon(":/qt-project.org/qmessagebox/images/qtlogo-64.png"), tr("About &Qt"), this); +#endif aboutQtAction->setStatusTip(tr("Show information about Qt")); aboutQtAction->setMenuRole(QAction::AboutQtRole); optionsAction = new QAction(QIcon(":/icons/options"), tr("&Options..."), this); |