diff options
| author | Hennadii Stepanov <32963518+hebasto@users.noreply.github.com> | 2022-04-15 11:57:15 +0200 |
|---|---|---|
| committer | Hennadii Stepanov <32963518+hebasto@users.noreply.github.com> | 2022-04-15 12:00:53 +0200 |
| commit | f3e0ace8ecd84009a23da6b0de47f01d79c45772 (patch) | |
| tree | cce8dfc6227bcf796a3fd2e6f458f5b5dda79aee /src/qt | |
| parent | 72477ebb11224c17252d59b424af65f33f57b2ba (diff) | |
| parent | 3eaf5dbfe0a0c814116e92f602f3c062259b6ea3 (diff) | |
Merge bitcoin-core/gui#579: Getting ready to Qt 6 (2/n). Remove `QApplication::globalStrut()`
3eaf5dbfe0a0c814116e92f602f3c062259b6ea3 qt: Remove `QApplication::globalStrut()` call (Hennadii Stepanov)
Pull request description:
This function has been deprecated in Qt 5.15.0, and has been [removed](https://github.com/qt/qtbase/commit/033d01bd6e2aef740ad1408a04d3ca0ae3b9ba9b) in Qt 6.
ACKs for top commit:
jarolrod:
ACK 3eaf5dbfe0a0c814116e92f602f3c062259b6ea3
luke-jr:
utACK 3eaf5dbfe0a0c814116e92f602f3c062259b6ea3
Tree-SHA512: 71ee539b6ffa3755f7e6beaa72a8937886471e298830878def6dd9f48c601611d94d52c638bc1602f938df2ba84ff8b130ea8da8e6c08ae7146173fa613a5003
Diffstat (limited to 'src/qt')
| -rw-r--r-- | src/qt/bitcoinamountfield.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/qt/bitcoinamountfield.cpp b/src/qt/bitcoinamountfield.cpp index 527a8cd84b..c92aecd095 100644 --- a/src/qt/bitcoinamountfield.cpp +++ b/src/qt/bitcoinamountfield.cpp @@ -144,8 +144,7 @@ public: opt.rect = rect(); - cachedMinimumSizeHint = style()->sizeFromContents(QStyle::CT_SpinBox, &opt, hint, this) - .expandedTo(QApplication::globalStrut()); + cachedMinimumSizeHint = style()->sizeFromContents(QStyle::CT_SpinBox, &opt, hint, this); } return cachedMinimumSizeHint; } |