Merge remote-tracking branch 'origin/5.6' into 5.7

Conflicts:
	tests/auto/compositor/compositor.pro
	tests/auto/compositor/compositor/compositor.pro

Change-Id: Id9f3cf97ca3b600bdafba846908643ff0f8964b9

14 files changed, 42 insertions, 37 deletions

diff --git a/tests/auto/compositor/compositor.pro b/tests/auto/compositor/compositor.pro
index 9f9044fdf..6bf2aef6c 100644
--- a/tests/auto/compositor/compositor.pro
+++ b/tests/auto/compositor/compositor.pro
@@ -1,38 +1,3 @@
-CONFIG += testcase link_pkgconfig
-CONFIG += wayland-scanner
-TARGET = tst_compositor
+TEMPLATE=subdirs
 
-QT += testlib
-QT += core-private gui-private waylandcompositor waylandcompositor-private
-
-!contains(QT_CONFIG, no-pkg-config) {
-    PKGCONFIG += wayland-client wayland-server
-} else {
-    LIBS += -lwayland-client -lwayland-server
-}
-
-config_xkbcommon {
-    !contains(QT_CONFIG, no-pkg-config) {
-        PKGCONFIG_PRIVATE += xkbcommon
-    } else {
-        LIBS_PRIVATE += -lxkbcommon
-    }
-} else {
-    DEFINES += QT_NO_WAYLAND_XKB
-}
-
-WAYLANDCLIENTSOURCES += \
-            ../../../src/3rdparty/protocol/xdg-shell.xml \
-
-SOURCES += tst_compositor.cpp \
-           testcompositor.cpp \
-           testkeyboardgrabber.cpp \
-           mockclient.cpp \
-           mockseat.cpp \
-           testinputdevice.cpp
-
-HEADERS += testcompositor.h \
-           testkeyboardgrabber.h \
-           mockclient.h \
-           mockseat.h \
-           testinputdevice.h
+SUBDIRS += compositor
diff --git a/tests/auto/compositor/BLACKLIST b/tests/auto/compositor/compositor/BLACKLIST
index df4672be3..df4672be3 100644
--- a/tests/auto/compositor/BLACKLIST
+++ b/tests/auto/compositor/compositor/BLACKLIST
diff --git a/tests/auto/compositor/compositor/compositor.pro b/tests/auto/compositor/compositor/compositor.pro
new file mode 100644
index 000000000..d85c30483
--- /dev/null
+++ b/tests/auto/compositor/compositor/compositor.pro
@@ -0,0 +1,40 @@
+CONFIG += testcase link_pkgconfig
+CONFIG += wayland-scanner
+TARGET = tst_compositor
+
+QT += testlib
+QT += core-private gui-private waylandcompositor waylandcompositor-private
+
+!contains(QT_CONFIG, no-pkg-config) {
+    PKGCONFIG += wayland-client wayland-server
+} else {
+    LIBS += -lwayland-client -lwayland-server
+}
+
+config_xkbcommon {
+    !contains(QT_CONFIG, no-pkg-config) {
+        PKGCONFIG_PRIVATE += xkbcommon
+    } else {
+        LIBS_PRIVATE += -lxkbcommon
+    }
+} else {
+    DEFINES += QT_NO_WAYLAND_XKB
+}
+
+WAYLANDCLIENTSOURCES += \
+            ../../../../src/3rdparty/protocol/xdg-shell.xml \
+
+SOURCES += \
+    tst_compositor.cpp \
+    testcompositor.cpp \
+    testkeyboardgrabber.cpp \
+    mockclient.cpp \
+    mockseat.cpp \
+    testinputdevice.cpp
+
+HEADERS += \
+    testcompositor.h \
+    testkeyboardgrabber.h \
+    mockclient.h \
+    mockseat.h \
+    testinputdevice.h
diff --git a/tests/auto/compositor/mockclient.cpp b/tests/auto/compositor/compositor/mockclient.cpp
index 9b6d327a9..9b6d327a9 100644
--- a/tests/auto/compositor/mockclient.cpp
+++ b/tests/auto/compositor/compositor/mockclient.cpp
diff --git a/tests/auto/compositor/mockclient.h b/tests/auto/compositor/compositor/mockclient.h
index 33ada638a..33ada638a 100644
--- a/tests/auto/compositor/mockclient.h
+++ b/tests/auto/compositor/compositor/mockclient.h
diff --git a/tests/auto/compositor/mockseat.cpp b/tests/auto/compositor/compositor/mockseat.cpp
index 29c4a4e13..29c4a4e13 100644
--- a/tests/auto/compositor/mockseat.cpp
+++ b/tests/auto/compositor/compositor/mockseat.cpp
diff --git a/tests/auto/compositor/mockseat.h b/tests/auto/compositor/compositor/mockseat.h
index 1c6d324c2..1c6d324c2 100644
--- a/tests/auto/compositor/mockseat.h
+++ b/tests/auto/compositor/compositor/mockseat.h
diff --git a/tests/auto/compositor/testcompositor.cpp b/tests/auto/compositor/compositor/testcompositor.cpp
index dfa26a542..dfa26a542 100644
--- a/tests/auto/compositor/testcompositor.cpp
+++ b/tests/auto/compositor/compositor/testcompositor.cpp
diff --git a/tests/auto/compositor/testcompositor.h b/tests/auto/compositor/compositor/testcompositor.h
index fb5909d19..fb5909d19 100644
--- a/tests/auto/compositor/testcompositor.h
+++ b/tests/auto/compositor/compositor/testcompositor.h
diff --git a/tests/auto/compositor/testinputdevice.cpp b/tests/auto/compositor/compositor/testinputdevice.cpp
index 5c02dff85..5c02dff85 100644
--- a/tests/auto/compositor/testinputdevice.cpp
+++ b/tests/auto/compositor/compositor/testinputdevice.cpp
diff --git a/tests/auto/compositor/testinputdevice.h b/tests/auto/compositor/compositor/testinputdevice.h
index e6134aa18..e6134aa18 100644
--- a/tests/auto/compositor/testinputdevice.h
+++ b/tests/auto/compositor/compositor/testinputdevice.h
diff --git a/tests/auto/compositor/testkeyboardgrabber.cpp b/tests/auto/compositor/compositor/testkeyboardgrabber.cpp
index 315b7f4fd..315b7f4fd 100644
--- a/tests/auto/compositor/testkeyboardgrabber.cpp
+++ b/tests/auto/compositor/compositor/testkeyboardgrabber.cpp
diff --git a/tests/auto/compositor/testkeyboardgrabber.h b/tests/auto/compositor/compositor/testkeyboardgrabber.h
index ca5f51628..ca5f51628 100644
--- a/tests/auto/compositor/testkeyboardgrabber.h
+++ b/tests/auto/compositor/compositor/testkeyboardgrabber.h
diff --git a/tests/auto/compositor/tst_compositor.cpp b/tests/auto/compositor/compositor/tst_compositor.cpp
index 8405277b4..8405277b4 100644
--- a/tests/auto/compositor/tst_compositor.cpp
+++ b/tests/auto/compositor/compositor/tst_compositor.cpp