Merge pull request #3068 from Diapolo/qt-icon
Bitcoin-Qt: ensure Qt icon is shown with Qt >= 5.0
This commit is contained in:
commit
26002aa444
1 changed files with 4 additions and 0 deletions
|
@ -235,7 +235,11 @@ void BitcoinGUI::createActions(bool fIsTestnet)
|
||||||
aboutAction = new QAction(QIcon(":/icons/bitcoin_testnet"), tr("&About Bitcoin"), this);
|
aboutAction = new QAction(QIcon(":/icons/bitcoin_testnet"), tr("&About Bitcoin"), this);
|
||||||
aboutAction->setStatusTip(tr("Show information about Bitcoin"));
|
aboutAction->setStatusTip(tr("Show information about Bitcoin"));
|
||||||
aboutAction->setMenuRole(QAction::AboutRole);
|
aboutAction->setMenuRole(QAction::AboutRole);
|
||||||
|
#if QT_VERSION < 0x050000
|
||||||
aboutQtAction = new QAction(QIcon(":/trolltech/qmessagebox/images/qtlogo-64.png"), tr("About &Qt"), this);
|
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->setStatusTip(tr("Show information about Qt"));
|
||||||
aboutQtAction->setMenuRole(QAction::AboutQtRole);
|
aboutQtAction->setMenuRole(QAction::AboutQtRole);
|
||||||
optionsAction = new QAction(QIcon(":/icons/options"), tr("&Options..."), this);
|
optionsAction = new QAction(QIcon(":/icons/options"), tr("&Options..."), this);
|
||||||
|
|
Loading…
Reference in a new issue