summaryrefslogtreecommitdiffstats
path: root/tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp
diff options
context:
space:
mode:
authorVolker Hilsheimer <volker.hilsheimer@qt.io>2020-04-16 15:00:06 +0200
committerVolker Hilsheimer <volker.hilsheimer@qt.io>2020-04-17 20:49:06 +0200
commit714409b23ce5ec33e56adce5ba1966aad67c3b34 (patch)
tree83f4655ecfa83f249e85700ce54ca72794d2e544 /tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp
parent30141b2fb7bf3800c0f4374d9adfd23eb40ed275 (diff)
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>
Diffstat (limited to 'tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp')
-rw-r--r--tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp12
1 files changed, 0 insertions, 12 deletions
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);
}