diff options
| author | Hennadii Stepanov <32963518+hebasto@users.noreply.github.com> | 2022-04-13 01:22:33 +0200 |
|---|---|---|
| committer | Hennadii Stepanov <32963518+hebasto@users.noreply.github.com> | 2022-04-13 01:27:16 +0200 |
| commit | f60a63cc5f16b738d9d2ada3f10b27cf999df323 (patch) | |
| tree | d0d3edfa652d54006f2b450c125634f83df5980a /src/qt/guiutil.cpp | |
| parent | f50976002645a2293b7c7e5c1c39bc5026167950 (diff) | |
| parent | 63125752a902de725f8aad1ee5bdaf5cb0c70f91 (diff) | |
| download | bitcoin-f60a63cc5f16b738d9d2ada3f10b27cf999df323.tar.xz | |
Merge bitcoin-core/gui#577: Getting ready to Qt 6 (1/n)
63125752a902de725f8aad1ee5bdaf5cb0c70f91 qt: Update deprecated enum value (Hennadii Stepanov)
c7add881a674d927e58f11dac0dca223c7322cb9 qt: Use `|` instead of `+` for key modifiers (Hennadii Stepanov)
6f1e162fe135d051d16859be57ef44d191e095cc qt: Fix headers (Hennadii Stepanov)
Pull request description:
For Qt 5 all changes in this PR are refactoring. But for [Qt 6](https://github.com/bitcoin/bitcoin/pull/24798) they are real bugfixes :)
As I do not provide anyway way to build `bitcoin-qt` against Qt 6.2.4 fir now, suggesting to reviewers to verify changes for Qt 5 only.
ACKs for top commit:
shaavan:
ACK 63125752a902de725f8aad1ee5bdaf5cb0c70f91
jarolrod:
tACK https://github.com/bitcoin-core/gui/commit/63125752a902de725f8aad1ee5bdaf5cb0c70f91
Tree-SHA512: ceee983192ddf62f09c1305458af3447ff0e3bd90311fa6328b139673bcaed3407dc0ce0b275028d4e0ca251d6b54dad40b48049211aeb251f65cbb4f5330834
Diffstat (limited to 'src/qt/guiutil.cpp')
| -rw-r--r-- | src/qt/guiutil.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/qt/guiutil.cpp b/src/qt/guiutil.cpp index 95b0a390e0..ca0b8c20f0 100644 --- a/src/qt/guiutil.cpp +++ b/src/qt/guiutil.cpp @@ -60,6 +60,7 @@ #include <QSettings> #include <QShortcut> #include <QSize> +#include <QStandardPaths> #include <QString> #include <QTextDocument> // for Qt::mightBeRichText #include <QThread> |