Merge #10454: Fix broken q4 test build

620444bd5 Fix broken q4 test build (Russell Yanofsky)

Tree-SHA512: 3247458541e5586e5a2cfc0abda3c54f140c676603ea5a3bdc0d11aae335d0221bbc818fc5fa458242fd4bacd326fca1013fc0320d5c91b672b8ca9684fb7bf8
This commit is contained in:
Jonas Schnelli 2017-05-31 10:38:19 +02:00
commit c1c9a95379
No known key found for this signature in database
GPG key ID: 1EB776BB03C7922D

View file

@ -90,6 +90,17 @@ QModelIndex FindTx(const QAbstractItemModel& model, const uint256& txid)
return {}; return {};
} }
//! Request context menu (call method that is public in qt5, but protected in qt4).
void RequestContextMenu(QWidget* widget)
{
class Qt4Hack : public QWidget
{
public:
using QWidget::customContextMenuRequested;
};
static_cast<Qt4Hack*>(widget)->customContextMenuRequested({});
}
//! Invoke bumpfee on txid and check results. //! Invoke bumpfee on txid and check results.
void BumpFee(TransactionView& view, const uint256& txid, bool expectDisabled, std::string expectError, bool cancel) void BumpFee(TransactionView& view, const uint256& txid, bool expectDisabled, std::string expectError, bool cancel)
{ {
@ -102,7 +113,7 @@ void BumpFee(TransactionView& view, const uint256& txid, bool expectDisabled, st
QAction* action = view.findChild<QAction*>("bumpFeeAction"); QAction* action = view.findChild<QAction*>("bumpFeeAction");
table->selectionModel()->select(index, QItemSelectionModel::ClearAndSelect | QItemSelectionModel::Rows); table->selectionModel()->select(index, QItemSelectionModel::ClearAndSelect | QItemSelectionModel::Rows);
action->setEnabled(expectDisabled); action->setEnabled(expectDisabled);
table->customContextMenuRequested({}); RequestContextMenu(table);
QCOMPARE(action->isEnabled(), !expectDisabled); QCOMPARE(action->isEnabled(), !expectDisabled);
action->setEnabled(true); action->setEnabled(true);