merge bitcoin#18914, #13306, #16424, #13899, #17486, #17880, #18145, #18843, #16710: split warnings out of CXXFLAGS, add more flags#4196
Merged
UdjinM6 merged 9 commits intodashpay:developfrom Jun 23, 2021
Conversation
Member
|
Better to backport bitcoin#18914 to avoid merge conflicts |
kwvg
changed the title
kwvg
changed the title
UdjinM6
requested changes
Jun 16, 2021
UdjinM6
left a comment
UdjinM6
left a comment
There was a problem hiding this comment.
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;
kwvg
force-pushed
the
override
branch
2 times, most recently
from
93b76fb to
31e192f
Compare
kwvg
changed the title
kwvg
changed the title
UdjinM6
requested changes
Jun 17, 2021
UdjinM6
approved these changes
Jun 23, 2021
UdjinM6
left a comment
UdjinM6
left a comment
There was a problem hiding this comment.
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
Merged
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Should take care of this warning generated on macOS Mojave