From c96c81ff26561c9c1f6a053f5899d569dba1163d Mon Sep 17 00:00:00 2001
From: Robert Griebl <robert.griebl@pelagicore.com>
Date: Thu, 30 Nov 2017 15:27:57 +0100
Subject: Use the touch emulation functionality in the application-manager

The touch emulation code was moved to the application-manager with
commit 9a67912, so we can remove the code from Neptune now.
---
 tests/triton-qmlscene/triton-qmlscene.cpp |  9 ---------
 tests/triton-qmlscene/triton-qmlscene.pro | 10 ----------
 2 files changed, 19 deletions(-)

(limited to 'tests')

diff --git a/tests/triton-qmlscene/triton-qmlscene.cpp b/tests/triton-qmlscene/triton-qmlscene.cpp
index 3ff74d3a..2b1a49e4 100644
--- a/tests/triton-qmlscene/triton-qmlscene.cpp
+++ b/tests/triton-qmlscene/triton-qmlscene.cpp
@@ -57,9 +57,6 @@
 #include <QtCore/QTranslator>
 #include <QtCore/QLibraryInfo>
 
-#ifdef TRITON_ENABLE_TOUCH_EMULATION
-#  include <MouseTouchAdaptor.h>
-#endif
 
 #ifdef QML_RUNTIME_TESTING
 class RenderStatistics
@@ -628,12 +625,6 @@ int main(int argc, char ** argv)
                 }
             }
 
-#ifdef TRITON_ENABLE_TOUCH_EMULATION
-            QScopedPointer<MouseTouchAdaptor> mouseTouchAdaptor;
-            if (QTouchDevice::devices().isEmpty())
-                mouseTouchAdaptor.reset(MouseTouchAdaptor::instance());
-#endif
-
             if (window) {
                 setWindowTitle(options.verbose, topLevel, window.data());
 #if QT_CONFIG(opengl)
diff --git a/tests/triton-qmlscene/triton-qmlscene.pro b/tests/triton-qmlscene/triton-qmlscene.pro
index f2fe3308..91cf2f5d 100644
--- a/tests/triton-qmlscene/triton-qmlscene.pro
+++ b/tests/triton-qmlscene/triton-qmlscene.pro
@@ -4,13 +4,3 @@ TARGET = triton-qmlscene
 QT += qml quick quick-private gui-private core-private
 
 SOURCES = triton-qmlscene.cpp
-
-unix:!macos:system($$pkgConfigExecutable() --libs x11 xi xcb) {
-    CONFIG += link_pkgconfig
-    PKGCONFIG += xcb x11 xi
-    SOURCES += ../../src/MouseTouchAdaptor.cpp
-    HEADERS += ../../src/MouseTouchAdaptor.h
-    DEFINES += TRITON_ENABLE_TOUCH_EMULATION
-    INCLUDEPATH += $$SOURCE_DIR/src
-    QT += testlib
-}
-- 
cgit v1.2.3