Merge remote-tracking branch 'origin/wip/qt6' into wip/cmake

Change-Id: I2963c1209316fb6755f572969f368970450d7991

1 files changed, 20 insertions, 28 deletions

diff --git a/examples/qml/referenceexamples/extended/lineedit.cpp b/examples/qml/referenceexamples/extended/lineedit.cpp
index f2f5ec0efc..777e15db07 100644
--- a/examples/qml/referenceexamples/extended/lineedit.cpp
+++ b/examples/qml/referenceexamples/extended/lineedit.cpp
@@ -57,58 +57,50 @@ LineEditExtension::LineEditExtension(QObject *object)
 
 int LineEditExtension::leftMargin() const
 {
-    int l, r, t, b;
-    m_lineedit->getTextMargins(&l, &t, &r, &b);
-    return l;
+    return m_lineedit->textMargins().left();
 }
 
-void LineEditExtension::setLeftMargin(int m)
+void LineEditExtension::setLeftMargin(int l)
 {
-    int l, r, t, b;
-    m_lineedit->getTextMargins(&l, &t, &r, &b);
-    m_lineedit->setTextMargins(m, t, r, b);
+    QMargins m = m_lineedit->textMargins();
+    m.setLeft(l);
+    m_lineedit->setTextMargins(m);
 }
 
 int LineEditExtension::rightMargin() const
 {
-    int l, r, t, b;
-    m_lineedit->getTextMargins(&l, &t, &r, &b);
-    return r;
+    return m_lineedit->textMargins().right();
 }
 
-void LineEditExtension::setRightMargin(int m)
+void LineEditExtension::setRightMargin(int r)
 {
-    int l, r, t, b;
-    m_lineedit->getTextMargins(&l, &t, &r, &b);
-    m_lineedit->setTextMargins(l, t, m, b);
+    QMargins m = m_lineedit->textMargins();
+    m.setRight(r);
+    m_lineedit->setTextMargins(m);
 }
 
 int LineEditExtension::topMargin() const
 {
-    int l, r, t, b;
-    m_lineedit->getTextMargins(&l, &t, &r, &b);
-    return t;
+    return m_lineedit->textMargins().top();
 }
 
-void LineEditExtension::setTopMargin(int m)
+void LineEditExtension::setTopMargin(int t)
 {
-    int l, r, t, b;
-    m_lineedit->getTextMargins(&l, &t, &r, &b);
-    m_lineedit->setTextMargins(l, m, r, b);
+    QMargins m = m_lineedit->textMargins();
+    m.setTop(t);
+    m_lineedit->setTextMargins(m);
 }
 
 int LineEditExtension::bottomMargin() const
 {
-    int l, r, t, b;
-    m_lineedit->getTextMargins(&l, &t, &r, &b);
-    return b;
+    return m_lineedit->textMargins().bottom();
 }
 
-void LineEditExtension::setBottomMargin(int m)
+void LineEditExtension::setBottomMargin(int b)
 {
-    int l, r, t, b;
-    m_lineedit->getTextMargins(&l, &t, &r, &b);
-    m_lineedit->setTextMargins(l, t, r, m);
+    QMargins m = m_lineedit->textMargins();
+    m.setBottom(b);
+    m_lineedit->setTextMargins(m);
 }