1 files changed, 26 insertions, 4 deletions

diff --git a/tests/auto/quick/qquicktextedit/tst_qquicktextedit.cpp b/tests/auto/quick/qquicktextedit/tst_qquicktextedit.cpp
index facd63027e..8ea2ce3bfb 100644
--- a/tests/auto/quick/qquicktextedit/tst_qquicktextedit.cpp
+++ b/tests/auto/quick/qquicktextedit/tst_qquicktextedit.cpp
@@ -131,8 +131,10 @@ private slots:
     void mouseSelectionMode_accessors();
     void selectByMouse();
     void selectByKeyboard();
+#if QT_CONFIG(shortcut)
     void keyboardSelection_data();
     void keyboardSelection();
+#endif
     void renderType();
     void inputMethodHints();
 
@@ -190,16 +192,19 @@ private slots:
     void insert();
     void remove_data();
     void remove();
-
+#if QT_CONFIG(shortcut)
     void keySequence_data();
     void keySequence();
+#endif
 
     void undo_data();
     void undo();
     void redo_data();
     void redo();
+#if QT_CONFIG(shortcut)
     void undo_keypressevents_data();
     void undo_keypressevents();
+#endif
     void clear();
 
     void baseUrl();
@@ -217,9 +222,11 @@ private slots:
 
 private:
     void simulateKeys(QWindow *window, const QList<Key> &keys);
+#if QT_CONFIG(shortcut)
     void simulateKeys(QWindow *window, const QKeySequence &sequence);
+#endif
 
-    void simulateKey(QWindow *, int key, Qt::KeyboardModifiers modifiers = nullptr);
+    void simulateKey(QWindow *, int key, Qt::KeyboardModifiers modifiers = {});
 
     QStringList standard;
     QStringList richText;
@@ -260,6 +267,8 @@ void tst_qquicktextedit::simulateKeys(QWindow *window, const QList<Key> &keys)
     }
 }
 
+#if QT_CONFIG(shortcut)
+
 void tst_qquicktextedit::simulateKeys(QWindow *window, const QKeySequence &sequence)
 {
     for (int i = 0; i < sequence.count(); ++i) {
@@ -277,6 +286,8 @@ QList<Key> &operator <<(QList<Key> &keys, const QKeySequence &sequence)
     return keys;
 }
 
+#endif // QT_CONFIG(shortcut)
+
 template <int N> QList<Key> &operator <<(QList<Key> &keys, const char (&characters)[N])
 {
     for (int i = 0; i < N - 1; ++i) {
@@ -916,7 +927,7 @@ void tst_qquicktextedit::hAlignVisual()
     {
         if ((QGuiApplication::platformName() == QLatin1String("offscreen"))
             || (QGuiApplication::platformName() == QLatin1String("minimal")))
-            QEXPECT_FAIL("", "Failure due to grabWindow not functional on offscreen/minimimal platforms", Abort);
+            QEXPECT_FAIL("", "Failure due to grabWindow not functional on offscreen/minimal platforms", Abort);
 
         // Left Align
         QImage image = view.grabWindow();
@@ -1378,7 +1389,7 @@ void tst_qquicktextedit::focusOnPress()
     QCOMPARE(textEditObject->hasActiveFocus(), false);
 
     QPoint centerPoint(window.width()/2, window.height()/2);
-    Qt::KeyboardModifiers noModifiers = nullptr;
+    Qt::KeyboardModifiers noModifiers;
     QTest::mousePress(&window, Qt::LeftButton, noModifiers, centerPoint);
     QGuiApplication::processEvents();
     QCOMPARE(textEditObject->hasFocus(), true);
@@ -2307,6 +2318,8 @@ void tst_qquicktextedit::selectByKeyboard()
     QCOMPARE(spy.at(2).at(0).toBool(), false);
 }
 
+#if QT_CONFIG(shortcut)
+
 Q_DECLARE_METATYPE(QKeySequence::StandardKey)
 
 void tst_qquicktextedit::keyboardSelection_data()
@@ -2391,6 +2404,8 @@ void tst_qquicktextedit::keyboardSelection()
     QCOMPARE(edit->selectedText(), selectedText);
 }
 
+#endif // QT_CONFIG(shortcut)
+
 void tst_qquicktextedit::renderType()
 {
     QQmlComponent component(&engine);
@@ -4820,6 +4835,7 @@ void tst_qquicktextedit::remove()
         QVERIFY(cursorPositionSpy.count() > 0);
 }
 
+#if QT_CONFIG(shortcut)
 
 void tst_qquicktextedit::keySequence_data()
 {
@@ -4984,6 +5000,8 @@ void tst_qquicktextedit::keySequence()
     QCOMPARE(textEdit->selectedText(), selectedText);
 }
 
+#endif // QT_CONFIG(shortcut)
+
 #define NORMAL 0
 #define REPLACE_UNTIL_END 1
 
@@ -5257,6 +5275,8 @@ void tst_qquicktextedit::redo()
     QCOMPARE(spy.count(), 2);
 }
 
+#if QT_CONFIG(shortcut)
+
 void tst_qquicktextedit::undo_keypressevents_data()
 {
     QTest::addColumn<KeyList>("keys");
@@ -5450,6 +5470,8 @@ void tst_qquicktextedit::undo_keypressevents()
     QVERIFY(textEdit->text().isEmpty());
 }
 
+#endif // QT_CONFIG(shortcut)
+
 void tst_qquicktextedit::clear()
 {
     QString componentStr = "import QtQuick 2.0\nTextEdit { focus: true }";