-
Notifications
You must be signed in to change notification settings - Fork 1.2k
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.
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
merge bitcoin#18914, #13306, #16424, #13899, #17486, #17880, #18145, #18843, #16710: split warnings out of CXXFLAGS, add more flags #4196
Conversation
Better to backport bitcoin#18914 to avoid merge conflicts |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
diff --git a/src/qt/qrdialog.h b/src/qt/qrdialog.h
index 46d9cbcb1a..3c503fe1e3 100644
--- a/src/qt/qrdialog.h
+++ b/src/qt/qrdialog.h
@@ -35,8 +35,8 @@ public Q_SLOTS:
void copyImage();
protected:
- virtual void mousePressEvent(QMouseEvent *event);
- virtual void contextMenuEvent(QContextMenuEvent *event);
+ virtual void mousePressEvent(QMouseEvent *event) override;
+ virtual void contextMenuEvent(QContextMenuEvent *event) override;
private:
QMenu *contextMenu;
93b76fb
to
31e192f
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
utACK
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
13899 is incomplete but it's fine, can be fixed later (there are quite a few other things to fix when compiled with these new flags)
ACK
Should take care of this warning generated on macOS Mojave