merge bitcoin#17227...#23580: Qt 5.12.10 #4581
Merged
Conversation
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
5456054 to
5b5e138
Compare
|
Closing this for now as it's causing confusion and PR won't be needed till Qt5.12 bump. |
|
This pull request has conflicts, please rebase. |
|
This pull request has conflicts, please rebase. |
|
This pull request has conflicts, please rebase. |
|
This pull request has conflicts, please rebase. |
|
This pull request has conflicts, please rebase. |
PastaPastaPasta
approved these changes
Apr 26, 2022
UdjinM6
approved these changes
Apr 26, 2022
Comment on lines
+1
to
+22
| From: Øystein Heskestad <oystein.heskestad@qt.io> | ||
| Date: Wed, 27 Oct 2021 13:07:46 +0200 | ||
| Subject: [PATCH] Add missing macOS header file that was indirectly included before | ||
|
|
||
| See: https://bugreports.qt.io/browse/QTBUG-97855 | ||
|
|
||
| Upstream Commits: | ||
| - Qt 6.2: c884bf138a21dd7320e35cef34d24e22e74d7ce0 | ||
|
|
||
| diff --git a/qtbase/src/plugins/platforms/cocoa/qiosurfacegraphicsbuffer.h b/qtbase/src/plugins/platforms/cocoa/qiosurfacegraphicsbuffer.h | ||
| index e070ba977d..0896917334 100644 | ||
| --- a/qtbase/src/plugins/platforms/cocoa/qiosurfacegraphicsbuffer.h | ||
| +++ b/qtbase/src/plugins/platforms/cocoa/qiosurfacegraphicsbuffer.h | ||
| @@ -43,6 +43,8 @@ | ||
| #include <qpa/qplatformgraphicsbuffer.h> | ||
| #include <private/qcore_mac_p.h> | ||
|
|
||
| +#include <CoreGraphics/CGColorSpace.h> | ||
| + | ||
| QT_BEGIN_NAMESPACE | ||
|
|
||
| class QIOSurfaceGraphicsBuffer : public QPlatformGraphicsBuffer |
There was a problem hiding this comment.
23580: the patch is similar to the one in upstream but it's a bit different
| @@ -321,7 +321,8 @@ void AddressBookPage::on_exportButton_clicked() | |||
|
|
|||
| if(!writer.write()) { | |||
| QMessageBox::critical(this, tr("Exporting Failed"), | |||
| tr("There was an error trying to save the address list to %1. Please try again.").arg(filename)); | |||
| //: %1 is a name of the file (e.g., "addrbook.csv") that the bitcoin addresses were exported to. | |||
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Relies on #4681 so that af88980 can be avoided