Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix compile errors with Qt 5.3.2 and Boost 1.55.0 #10039

Merged
merged 2 commits into from
Mar 21, 2017
Merged

Fix compile errors with Qt 5.3.2 and Boost 1.55.0 #10039

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d5046e7
Avoid scoped_connection compile error with boost 1.55.0
ryanofsky Mar 20, 2017
b5bec4e
Avoid QTimer::singleShot compile error with Qt 5.3.2
ryanofsky Mar 20, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion src/qt/test/wallettests.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,9 @@ namespace
//! Press "Yes" button in modal send confirmation dialog.
void ConfirmSend()
{
QTimer::singleShot(0, Qt::PreciseTimer, []() {
QTimer* timer = new QTimer;
timer->setSingleShot(true);
QObject::connect(timer, &QTimer::timeout, []() {
Copy link
Contributor

@gmaxwell gmaxwell Apr 1, 2017 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This fails to compile for me on debian testing with qt/test/wallettests.cpp:36:6: error: no matching function for call to ‘QObject::connect(QTimer*&, void (QTimer::*)(),
{anonymous}::ConfirmSend()::<lambda()>)’ });

(edit, actually reverting this commit by itself and it fails elsewhere with qt/test/wallettests.cpp:25:27: error: ‘PreciseTimer’ is not a member of ‘Qt’
QTimer::singleShot(0, Qt::PreciseTimer, {)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

#10098 fixes this

for (QWidget* widget : QApplication::topLevelWidgets()) {
if (widget->inherits("SendConfirmationDialog")) {
SendConfirmationDialog* dialog = qobject_cast<SendConfirmationDialog*>(widget);
Expand All @@ -32,6 +34,7 @@ void ConfirmSend()
}
}
});
timer->start(0);
}

//! Send coins to address and return txid.
Expand Down