Remove deprecated members from QtWidgets/widgets classes

Cleaning up those that are trivial to remove because they have direct
replacements.

The QLabel changes to the pixmap/picture getters provide the following
migration path:

QPixmap *ppix = l->pixmap(); // up to 5.15, warns in 5.15
QPixmap pval = l->pixmap(Qt::ReturnByValue); // new in 5.15, works in 6
QPixmap pixmap = l->pixmap(); // from Qt 6 on

The overload with argument can be deprecated after the first LTS or
so.

Change-Id: I8494ceeea55b2aeda0bd340640ad95cb7c91f7d6
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>

2 files changed, 5 insertions, 19 deletions

diff --git a/tests/auto/widgets/widgets/qdockwidget/tst_qdockwidget.cpp b/tests/auto/widgets/widgets/qdockwidget/tst_qdockwidget.cpp
index 9a16c39014..8ece03983b 100644
--- a/tests/auto/widgets/widgets/qdockwidget/tst_qdockwidget.cpp
+++ b/tests/auto/widgets/widgets/qdockwidget/tst_qdockwidget.cpp
@@ -103,8 +103,6 @@ void tst_QDockWidget::getSetCheck()
     QCOMPARE(QDockWidget::DockWidgetFeatures(QDockWidget::DockWidgetMovable), obj1.features());
     obj1.setFeatures(QDockWidget::DockWidgetFeatures(QDockWidget::DockWidgetFloatable));
     QCOMPARE(QDockWidget::DockWidgetFeatures(QDockWidget::DockWidgetFloatable), obj1.features());
-    obj1.setFeatures(QDockWidget::DockWidgetFeatures(QDockWidget::AllDockWidgetFeatures));
-    QCOMPARE(QDockWidget::DockWidgetFeatures(QDockWidget::AllDockWidgetFeatures), obj1.features());
     obj1.setFeatures(QDockWidget::DockWidgetFeatures(QDockWidget::NoDockWidgetFeatures));
     QCOMPARE(QDockWidget::DockWidgetFeatures(QDockWidget::NoDockWidgetFeatures), obj1.features());
 }
@@ -207,9 +205,9 @@ void tst_QDockWidget::features()
     QSignalSpy spy(&dw, SIGNAL(featuresChanged(QDockWidget::DockWidgetFeatures)));
 
     // default features for dock widgets
-    int allDockWidgetFeatures = QDockWidget::DockWidgetClosable |
-                                QDockWidget::DockWidgetMovable  |
-                                QDockWidget::DockWidgetFloatable;
+    const auto allDockWidgetFeatures = QDockWidget::DockWidgetClosable |
+                                       QDockWidget::DockWidgetMovable  |
+                                       QDockWidget::DockWidgetFloatable;
 
     // defaults
     QCOMPARE(dw.features(), allDockWidgetFeatures);
@@ -323,8 +321,8 @@ void tst_QDockWidget::features()
     QCOMPARE(spy.count(), 0);
     spy.clear();
 
-    dw.setFeatures(QDockWidget::AllDockWidgetFeatures);
-    QCOMPARE(dw.features(), QDockWidget::AllDockWidgetFeatures);
+    dw.setFeatures(allDockWidgetFeatures);
+    QCOMPARE(dw.features(), allDockWidgetFeatures);
     QVERIFY(hasFeature(&dw, QDockWidget::DockWidgetClosable));
     QVERIFY(hasFeature(&dw, QDockWidget::DockWidgetMovable));
     QVERIFY(hasFeature(&dw, QDockWidget::DockWidgetFloatable));
diff --git a/tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp b/tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp
index bf31f12958..6b0beb614a 100644
--- a/tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp
+++ b/tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp
@@ -3582,18 +3582,6 @@ void tst_QLineEdit::textMargin()
     QCOMPARE(right, margins.right());
     QCOMPARE(bottom, margins.bottom());
 
-#if QT_DEPRECATED_SINCE(5, 14)
-    int l;
-    int t;
-    int r;
-    int b;
-    testWidget.getTextMargins(&l, &t, &r, &b);
-    QCOMPARE(left, l);
-    QCOMPARE(top, t);
-    QCOMPARE(right, r);
-    QCOMPARE(bottom, b);
-#endif
-
     QTest::mouseClick(&testWidget, Qt::LeftButton, {}, mousePressPos);
     QTRY_COMPARE(testWidget.cursorPosition(), cursorPosition);
 }