Merge bitcoin-core/gui#579: Getting ready to Qt 6 (2/n). Remove QApplication::globalStrut()

hebasto · hebasto · commit f3e0ace8ecd8 · 2022-04-15T12:00:53.000+02:00
3eaf5db qt: Remove `QApplication::globalStrut()` call (Hennadii Stepanov) Pull request description: This function has been deprecated in Qt 5.15.0, and has been [removed](qt/qtbase@033d01b) in Qt 6. ACKs for top commit: jarolrod: ACK 3eaf5db luke-jr: utACK 3eaf5db Tree-SHA512: 71ee539b6ffa3755f7e6beaa72a8937886471e298830878def6dd9f48c601611d94d52c638bc1602f938df2ba84ff8b130ea8da8e6c08ae7146173fa613a5003
diff --git a/src/qt/bitcoinamountfield.cpp b/src/qt/bitcoinamountfield.cpp
@@ -144,8 +144,7 @@ class AmountSpinBox: public QAbstractSpinBox
 
             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;
     }

Original file line number	Diff line number	Diff line change
`@@ -144,8 +144,7 @@ class AmountSpinBox: public QAbstractSpinBox`
`144`	`144`
`145`	`145`	`opt.rect = rect();`
`146`	`146`
`147`		`- cachedMinimumSizeHint = style()->sizeFromContents(QStyle::CT_SpinBox, &opt, hint, this)`
`148`		`- .expandedTo(QApplication::globalStrut());`
	`147`	`+ cachedMinimumSizeHint = style()->sizeFromContents(QStyle::CT_SpinBox, &opt, hint, this);`
`149`	`148`	`}`
`150`	`149`	`return cachedMinimumSizeHint;`
`151`	`150`	`}`