From 8f93d3627a9b76bf77896501129990e33a77f32c Mon Sep 17 00:00:00 2001
From: Jani Heikkinen <jani.heikkinen@qt.io>
Date: Fri, 1 Sep 2017 10:59:54 +0000
Subject: Revert "Make QtQuickTest::mouseEvent use QTest::mouseX"

It seems this is causing QTBUG-62925 and QTBUG-62926 so revert
is the best option at this point to proceed

This reverts commit 4c46dce8fd9c9dddddd1d07f56396b3eabb2efc4.

Change-Id: Ia8ea85c1ac1ada1752b29c9fbd8439f5963d46d2
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
Reviewed-by: Albert Astals Cid <albert.astals.cid@kdab.com>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
---
 tests/auto/quicktest/quicktest.pro               |  3 +-
 tests/auto/quicktest/testevent/testevent.pro     |  8 ---
 tests/auto/quicktest/testevent/tst_testevent.cpp | 81 ------------------------
 3 files changed, 1 insertion(+), 91 deletions(-)
 delete mode 100644 tests/auto/quicktest/testevent/testevent.pro
 delete mode 100644 tests/auto/quicktest/testevent/tst_testevent.cpp

(limited to 'tests/auto/quicktest')

diff --git a/tests/auto/quicktest/quicktest.pro b/tests/auto/quicktest/quicktest.pro
index ee22131753..3b4ec23a64 100644
--- a/tests/auto/quicktest/quicktest.pro
+++ b/tests/auto/quicktest/quicktest.pro
@@ -1,4 +1,3 @@
 TEMPLATE = subdirs
 SUBDIRS = \
-    signalspy \
-    testevent
+    signalspy
diff --git a/tests/auto/quicktest/testevent/testevent.pro b/tests/auto/quicktest/testevent/testevent.pro
deleted file mode 100644
index bd97e13b89..0000000000
--- a/tests/auto/quicktest/testevent/testevent.pro
+++ /dev/null
@@ -1,8 +0,0 @@
-CONFIG += testcase
-TARGET = tst_testevent
-macos:CONFIG -= app_bundle
-
-SOURCES += tst_testevent.cpp
-QT += quick testlib qmltest-private
-
-include (../../shared/util.pri)
diff --git a/tests/auto/quicktest/testevent/tst_testevent.cpp b/tests/auto/quicktest/testevent/tst_testevent.cpp
deleted file mode 100644
index 8adb98f33b..0000000000
--- a/tests/auto/quicktest/testevent/tst_testevent.cpp
+++ /dev/null
@@ -1,81 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <qtest.h>
-
-#include <QtQuick/qquickitem.h>
-#include <QtQuick/qquickwindow.h>
-#include "QtQuickTest/private/quicktestevent_p.h"
-
-class tst_testevent : public QObject
-{
-    Q_OBJECT
-public:
-
-private slots:
-    void moveSetsQuickItemIsUnderMouse();
-};
-
-void tst_testevent::moveSetsQuickItemIsUnderMouse()
-{
-    QQuickWindow w;
-    w.resize(400, 400);
-    w.show();
-    w.requestActivate();
-    QTest::qWaitForWindowActive(&w);
-
-    QTRY_COMPARE(QGuiApplication::focusWindow(), &w);
-
-    QQuickItem *item = new QQuickItem(w.contentItem());
-    item->setX(0);
-    item->setY(0);
-    item->setWidth(100);
-    item->setHeight(100);
-
-    QQuickItem *item2 = new QQuickItem(w.contentItem());
-    item2->setX(100);
-    item2->setY(100);
-    item2->setWidth(100);
-    item2->setHeight(100);
-
-    QuickTestEvent te;
-    te.mouseMove(w.contentItem(), 10, 10, /*delay*/ -1, Qt::NoButton);
-
-    QVERIFY(item->isUnderMouse());
-    QVERIFY(!item2->isUnderMouse());
-
-    te.mouseMove(w.contentItem(), 110, 110, /*delay*/ -1, Qt::NoButton);
-
-    QVERIFY(!item->isUnderMouse());
-    QVERIFY(item2->isUnderMouse());
-
-}
-
-QTEST_MAIN(tst_testevent)
-
-#include "tst_testevent.moc"
-- 
cgit v1.2.3