move qquickpointerhandler test to a subdirectory

Tests will become too complex to do them all in one class, so let's
have a subdirectory for each handler.

Change-Id: I157f6c150f15ca53d77bc9eb716723c6105e393a
Reviewed-by: Jan Arve Sæther <jan-arve.saether@theqtcompany.com>

4 files changed, 24 insertions, 17 deletions

diff --git a/tests/auto/quick/pointerhandlers/pointerhandlers.pro b/tests/auto/quick/pointerhandlers/pointerhandlers.pro
index 41e1196965..4a3f99765e 100644
--- a/tests/auto/quick/pointerhandlers/pointerhandlers.pro
+++ b/tests/auto/quick/pointerhandlers/pointerhandlers.pro
@@ -1,16 +1,7 @@
-CONFIG += testcase
+TEMPLATE = subdirs
 
-TARGET = tst_pointerhandlers
-QT += core-private gui-private qml-private quick-private  testlib
-
-macos:CONFIG -= app_bundle
-
-SOURCES  += tst_pointerhandlers.cpp
-
-include (../../shared/util.pri)
-include (../shared/util.pri)
-
-TESTDATA = data/*
-
-# OTHER_FILES += data/foo.qml
+qtConfig(private_tests) {
+    SUBDIRS += \
+        qquickpointerhandler \
+}
 
diff --git a/tests/auto/quick/pointerhandlers/data/singleitem.qml b/tests/auto/quick/pointerhandlers/qquickpointerhandler/data/singleitem.qml
index fe05a3f935..fe05a3f935 100644
--- a/tests/auto/quick/pointerhandlers/data/singleitem.qml
+++ b/tests/auto/quick/pointerhandlers/qquickpointerhandler/data/singleitem.qml
diff --git a/tests/auto/quick/pointerhandlers/qquickpointerhandler/qquickpointerhandler.pro b/tests/auto/quick/pointerhandlers/qquickpointerhandler/qquickpointerhandler.pro
new file mode 100644
index 0000000000..c386969206
--- /dev/null
+++ b/tests/auto/quick/pointerhandlers/qquickpointerhandler/qquickpointerhandler.pro
@@ -0,0 +1,16 @@
+CONFIG += testcase
+
+TARGET = tst_qquickpointerhandler
+QT += core-private gui-private qml-private quick-private  testlib
+
+macos:CONFIG -= app_bundle
+
+SOURCES  += tst_qquickpointerhandler.cpp
+
+include (../../../shared/util.pri)
+include (../../shared/util.pri)
+
+TESTDATA = data/*
+
+# OTHER_FILES += data/foo.qml
+
diff --git a/tests/auto/quick/pointerhandlers/tst_pointerhandlers.cpp b/tests/auto/quick/pointerhandlers/qquickpointerhandler/tst_qquickpointerhandler.cpp
index 7d2842d688..94bb44a12b 100644
--- a/tests/auto/quick/pointerhandlers/tst_pointerhandlers.cpp
+++ b/tests/auto/quick/pointerhandlers/qquickpointerhandler/tst_qquickpointerhandler.cpp
@@ -45,8 +45,8 @@
 #include <QtQml/qqmlengine.h>
 #include <QtQml/qqmlproperty.h>
 
-#include "../../shared/util.h"
-#include "../shared/viewtestutil.h"
+#include "../../../shared/util.h"
+#include "../../shared/viewtestutil.h"
 
 Q_LOGGING_CATEGORY(lcPointerTests, "qt.quick.pointer.tests")
 
@@ -461,5 +461,5 @@ void tst_PointerHandlers::mouseEventDelivery()
 
 QTEST_MAIN(tst_PointerHandlers)
 
-#include "tst_pointerhandlers.moc"
+#include "tst_qquickpointerhandler.moc"