Clone QEvents instead of copying

Copying QEvents is disabled in the latest QtBase.

Change-Id: I2735fd412a47deb5fb389615c73881aa6cce61ca
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

2 files changed, 25 insertions, 17 deletions

diff --git a/tests/auto/quick/qquickwebengineview/tst_qquickwebengineview.cpp b/tests/auto/quick/qquickwebengineview/tst_qquickwebengineview.cpp
index cc3c409a4..c1a95de97 100644
--- a/tests/auto/quick/qquickwebengineview/tst_qquickwebengineview.cpp
+++ b/tests/auto/quick/qquickwebengineview/tst_qquickwebengineview.cpp
@@ -771,9 +771,13 @@ void tst_QQuickWebEngineView::inputMethodHints()
     QTRY_COMPARE(input->inputMethodQuery(Qt::ImSurroundingText).toString(), QString("a@b.com"));
     QVERIFY(input->flags().testFlag(QQuickItem::ItemAcceptsInputMethod));
     QVERIFY(view->flags().testFlag(QQuickItem::ItemAcceptsInputMethod));
-    QInputMethodQueryEvent query(Qt::ImHints);
-    QGuiApplication::sendEvent(input, &query);
-    QTRY_COMPARE(Qt::InputMethodHints(query.value(Qt::ImHints).toUInt() & Qt::ImhExclusiveInputMask), Qt::ImhEmailCharactersOnly);
+    {
+        QInputMethodQueryEvent query(Qt::ImHints);
+        QGuiApplication::sendEvent(input, &query);
+        QTRY_COMPARE(
+                Qt::InputMethodHints(query.value(Qt::ImHints).toUInt() & Qt::ImhExclusiveInputMask),
+                Qt::ImhEmailCharactersOnly);
+    }
 
     // The focus of an editable DIV is given directly to it, so no shadow root element
     // is necessary. This tests the WebPage::editorState() method ability to get the
@@ -784,9 +788,13 @@ void tst_QQuickWebEngineView::inputMethodHints()
     QTRY_COMPARE(input->inputMethodQuery(Qt::ImSurroundingText).toString(), QString("bla"));
     QVERIFY(input->flags().testFlag(QQuickItem::ItemAcceptsInputMethod));
     QVERIFY(view->flags().testFlag(QQuickItem::ItemAcceptsInputMethod));
-    query = QInputMethodQueryEvent(Qt::ImHints);
-    QGuiApplication::sendEvent(input, &query);
-    QTRY_COMPARE(Qt::InputMethodHints(query.value(Qt::ImHints).toUInt()), Qt::ImhPreferLowercase | Qt::ImhNoPredictiveText | Qt::ImhMultiLine | Qt::ImhNoEditMenu | Qt::ImhNoTextHandles);
+    {
+        QInputMethodQueryEvent query(Qt::ImHints);
+        QGuiApplication::sendEvent(input, &query);
+        QTRY_COMPARE(Qt::InputMethodHints(query.value(Qt::ImHints).toUInt()),
+                     Qt::ImhPreferLowercase | Qt::ImhNoPredictiveText | Qt::ImhMultiLine
+                             | Qt::ImhNoEditMenu | Qt::ImhNoTextHandles);
+    }
 }
 
 void tst_QQuickWebEngineView::setZoomFactor()
diff --git a/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp b/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp
index b8d745002..87664cef9 100644
--- a/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp
+++ b/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp
@@ -616,10 +616,10 @@ void tst_QWebEngineView::focusInputTypes()
 
 class KeyEventRecordingWidget : public QWidget {
 public:
-    QList<QKeyEvent> pressEvents;
-    QList<QKeyEvent> releaseEvents;
-    void keyPressEvent(QKeyEvent *e) override { pressEvents << *e; }
-    void keyReleaseEvent(QKeyEvent *e) override { releaseEvents << *e; }
+    QList<QKeyEvent *> pressEvents;
+    QList<QKeyEvent *> releaseEvents;
+    void keyPressEvent(QKeyEvent *e) override { pressEvents << e->clone(); }
+    void keyReleaseEvent(QKeyEvent *e) override { releaseEvents << e->clone(); }
 };
 
 void tst_QWebEngineView::unhandledKeyEventPropagation()
@@ -665,15 +665,15 @@ void tst_QWebEngineView::unhandledKeyEventPropagation()
     // The page will consume the Tab key to change focus between elements while the arrow
     // keys won't be used.
     QCOMPARE(parentWidget.pressEvents.size(), 3);
-    QCOMPARE(parentWidget.pressEvents[0].key(), (int)Qt::Key_Right);
-    QCOMPARE(parentWidget.pressEvents[1].key(), (int)Qt::Key_Left);
-    QCOMPARE(parentWidget.pressEvents[2].key(), (int)Qt::Key_Y);
+    QCOMPARE(parentWidget.pressEvents[0]->key(), (int)Qt::Key_Right);
+    QCOMPARE(parentWidget.pressEvents[1]->key(), (int)Qt::Key_Left);
+    QCOMPARE(parentWidget.pressEvents[2]->key(), (int)Qt::Key_Y);
 
     // Key releases will all come back unconsumed.
-    QCOMPARE(parentWidget.releaseEvents[0].key(), (int)Qt::Key_Right);
-    QCOMPARE(parentWidget.releaseEvents[1].key(), (int)Qt::Key_Tab);
-    QCOMPARE(parentWidget.releaseEvents[2].key(), (int)Qt::Key_Left);
-    QCOMPARE(parentWidget.releaseEvents[3].key(), (int)Qt::Key_Y);
+    QCOMPARE(parentWidget.releaseEvents[0]->key(), (int)Qt::Key_Right);
+    QCOMPARE(parentWidget.releaseEvents[1]->key(), (int)Qt::Key_Tab);
+    QCOMPARE(parentWidget.releaseEvents[2]->key(), (int)Qt::Key_Left);
+    QCOMPARE(parentWidget.releaseEvents[3]->key(), (int)Qt::Key_Y);
 }
 
 void tst_QWebEngineView::horizontalScrollbarTest()