From c89fcec0bcb65aae737f2dd733790f74e4303114 Mon Sep 17 00:00:00 2001
From: Martin Negyokru <negyokru@inf.u-szeged.hu>
Date: Wed, 4 May 2022 14:40:33 +0200
Subject: Implement touchbrowser for widgets

Simplify touchMockingApplication.
Let QApplication synthesize touch events.
Unify quick and widgets touchbrowser.

Fixes: QTBUG-100417
Change-Id: If43432996ca18c67f3ae13ab0767d267b27dc9a2
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
---
 tests/manual/quick/touchbrowser/main.cpp | 41 +++++++-------------------------
 1 file changed, 9 insertions(+), 32 deletions(-)

(limited to 'tests/manual/quick/touchbrowser/main.cpp')

diff --git a/tests/manual/quick/touchbrowser/main.cpp b/tests/manual/quick/touchbrowser/main.cpp
index 7b222038e..1f4d7d869 100644
--- a/tests/manual/quick/touchbrowser/main.cpp
+++ b/tests/manual/quick/touchbrowser/main.cpp
@@ -1,16 +1,14 @@
-// Copyright (C) 2018 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+// Copyright (C) 2022 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
 
-#if defined(DESKTOP_BUILD)
 #include "touchmockingapplication.h"
-#endif
 #include "utils.h"
 
-#include <QtGui/QGuiApplication>
-#include <QtQml/QQmlApplicationEngine>
-#include <QtQml/QQmlContext>
-#include <QtQuick/QQuickView>
-#include <QtWebEngineQuick/qtwebenginequickglobal.h>
+#include <QGuiApplication>
+#include <QQmlApplicationEngine>
+#include <QQmlContext>
+#include <QQuickView>
+#include <QtWebEngineQuick>
 
 static QUrl startupUrl()
 {
@@ -29,31 +27,10 @@ static QUrl startupUrl()
 
 int main(int argc, char **argv)
 {
-    QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
-    QCoreApplication::setAttribute(Qt::AA_ShareOpenGLContexts);
-
-    // We use touch mocking on desktop and apply all the mobile switches.
-    QByteArrayList args = QByteArrayList()
-            << QByteArrayLiteral("--enable-embedded-switches")
-            << QByteArrayLiteral("--log-level=0");
-    const int count = args.size() + argc;
-    QList<char*> qargv(count);
-
-    qargv[0] = argv[0];
-    for (int i = 0; i < args.size(); ++i)
-        qargv[i + 1] = args[i].data();
-    for (int i = args.size() + 1; i < count; ++i)
-        qargv[i] = argv[i - args.size()];
-
-    int qAppArgCount = qargv.size();
-
     QtWebEngineQuick::initialize();
 
-#if defined(DESKTOP_BUILD)
-    TouchMockingApplication app(qAppArgCount, qargv.data());
-#else
-    QGuiApplication app(qAppArgCount, qargv.data());
-#endif
+    TouchMockingApplication app(argc, argv);
+    app.setAttribute(Qt::AA_SynthesizeTouchForUnhandledMouseEvents, true);
 
     QQuickView view;
     Utils utils;
-- 
cgit v1.2.1