1 files changed, 19 insertions, 5 deletions
diff --git a/tests/auto/widgets/widgets/qtextedit/tst_qtextedit.cpp b/tests/auto/widgets/widgets/qtextedit/tst_qtextedit.cpp
index 241b0e64f3..ddf2bcfa85 100644
--- a/tests/auto/widgets/widgets/qtextedit/tst_qtextedit.cpp
+++ b/tests/auto/widgets/widgets/qtextedit/tst_qtextedit.cpp
@@ -1,5 +1,5 @@
 // Copyright (C) 2016 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
 
 
 #include <QTest>
@@ -198,6 +198,8 @@ private slots:
     void nextFormatAfterEnterPressed_data();
     void nextFormatAfterEnterPressed();
 
+    void dontCrashWithCss();
+
 private:
     void createSelection();
     int blockCount() const;
@@ -757,6 +759,11 @@ void tst_QTextEdit::cursorPositionChanged()
     QCOMPARE(spy2.cursorPositions.size(), 1);
     QCOMPARE(spy2.cursorPositions.at(0), 0);
     QCOMPARE(ed->textCursor().position(), 0);
+
+    ed->selectAll();
+    QCOMPARE(spy2.cursorPositions.size(), 2);
+    QCOMPARE(spy2.cursorPositions.at(1), 11);
+    QCOMPARE(ed->textCursor().position(), 11);
 }
 
 void tst_QTextEdit::setTextCursor()
@@ -1347,7 +1354,7 @@ void tst_QTextEdit::copyAvailable_data()
 //Tests the copyAvailable slot for several cases
 void tst_QTextEdit::copyAvailable()
 {
-    QFETCH(pairListType,keystrokes);
+    QFETCH(const pairListType, keystrokes);
     QFETCH(QList<bool>, copyAvailable);
     QFETCH(QString, function);
 
@@ -1360,9 +1367,8 @@ void tst_QTextEdit::copyAvailable()
     QSignalSpy spyCopyAvailabe(ed, SIGNAL(copyAvailable(bool)));
 
     //Execute Keystrokes
-    foreach(keyPairType keyPair, keystrokes) {
+    for (keyPairType keyPair : keystrokes)
         QTest::keyClick(ed, keyPair.first, keyPair.second );
-    }
 
     //Execute ed->"function"
     if (function == "cut")
@@ -2539,7 +2545,6 @@ void tst_QTextEdit::inputMethodEvent()
 
     // test that input method gets chance to commit preedit when removing focus
     ed->setText("");
-    QApplicationPrivate::setActiveWindow(ed);
     QTRY_VERIFY(QApplication::focusWindow());
     QCOMPARE(qApp->focusObject(), ed);
 
@@ -3060,5 +3065,14 @@ void tst_QTextEdit::nextFormatAfterEnterPressed()
         QCOMPARE(prevBlockCursor.charFormat().property(it.key()), it.value());
 }
 
+void tst_QTextEdit::dontCrashWithCss()
+{
+    qApp->setStyleSheet("QWidget { font: 10pt; }");
+    QTextEdit edit;
+    edit.show();
+    qApp->setStyleSheet(QString());
+}
+
+
 QTEST_MAIN(tst_QTextEdit)
 #include "tst_qtextedit.moc"