Add cmake test for QtCompositor and disable cmake files for QtWaylandClient

Change-Id: Id6e2d46b55e521218a3c0f44cf9a4a2be5f0df7f
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>

12 files changed, 30 insertions, 11 deletions

diff --git a/src/client/client.pro b/src/client/client.pro
index 28c78ab0a..1d89619c0 100644
--- a/src/client/client.pro
+++ b/src/client/client.pro
@@ -8,6 +8,7 @@ MODULE_PLUGIN_TYPES = wayland-graphics-integration-client
 load(qt_module)
 
 CONFIG -= precompile_header
+CONFIG -= create_cmake
 CONFIG += link_pkgconfig qpa/genericunixfontdatabase wayland-scanner
 
 !equals(QT_WAYLAND_GL_CONFIG, nogl) {
diff --git a/src/compositor/compositor_api/qwaylandbufferref.h b/src/compositor/compositor_api/qwaylandbufferref.h
index 0d1573bbb..ded1f1d35 100644
--- a/src/compositor/compositor_api/qwaylandbufferref.h
+++ b/src/compositor/compositor_api/qwaylandbufferref.h
@@ -42,6 +42,8 @@
 #ifndef QWAYLANDBUFFERREF_H
 #define QWAYLANDBUFFERREF_H
 
+#include <QImage>
+
 #ifdef QT_COMPOSITOR_WAYLAND_GL
 #include <QtGui/qopengl.h>
 #endif
diff --git a/src/compositor/compositor_api/qwaylandquicksurface.h b/src/compositor/compositor_api/qwaylandquicksurface.h
index 6c464ecd7..12c9c9474 100644
--- a/src/compositor/compositor_api/qwaylandquicksurface.h
+++ b/src/compositor/compositor_api/qwaylandquicksurface.h
@@ -42,15 +42,14 @@
 #ifndef QQUICKWAYLANDSURFACE_H
 #define QQUICKWAYLANDSURFACE_H
 
-#include <QSGTexture>
-#include <QSGTextureProvider>
-
 #include "qwaylandsurface.h"
 
 struct wl_client;
 
 QT_BEGIN_NAMESPACE
 
+class QSGTexture;
+
 class QWaylandSurfaceItem;
 class QWaylandQuickSurfacePrivate;
 class QWaylandQuickCompositor;
diff --git a/src/compositor/compositor_api/qwaylandsurface.cpp b/src/compositor/compositor_api/qwaylandsurface.cpp
index 948743b1f..14d909490 100644
--- a/src/compositor/compositor_api/qwaylandsurface.cpp
+++ b/src/compositor/compositor_api/qwaylandsurface.cpp
@@ -52,7 +52,6 @@
 #include "wayland_wrapper/qwldatadevicemanager_p.h"
 
 #include "qwaylandcompositor.h"
-#include "waylandwindowmanagerintegration.h"
 #include "qwaylandsurface_p.h"
 #include "qwaylandbufferref.h"
 
diff --git a/src/compositor/wayland_wrapper/qwlcompositor.cpp b/src/compositor/wayland_wrapper/qwlcompositor.cpp
index 807f35803..062737476 100644
--- a/src/compositor/wayland_wrapper/qwlcompositor.cpp
+++ b/src/compositor/wayland_wrapper/qwlcompositor.cpp
@@ -88,7 +88,7 @@
 #include "hardware_integration/qwlhwintegration_p.h"
 #include "hardware_integration/qwlclientbufferintegration_p.h"
 #include "hardware_integration/qwlserverbufferintegration_p.h"
-#include "waylandwindowmanagerintegration.h"
+#include "windowmanagerprotocol/waylandwindowmanagerintegration_p.h"
 
 #include "hardware_integration/qwlclientbufferintegrationfactory_p.h"
 #include "hardware_integration/qwlserverbufferintegrationfactory_p.h"
diff --git a/src/compositor/wayland_wrapper/qwlsurface.cpp b/src/compositor/wayland_wrapper/qwlsurface.cpp
index 919e517dc..97f0bef7c 100644
--- a/src/compositor/wayland_wrapper/qwlsurface.cpp
+++ b/src/compositor/wayland_wrapper/qwlsurface.cpp
@@ -55,10 +55,6 @@
 
 #include <wayland-server.h>
 
-#ifdef QT_WAYLAND_WINDOWMANAGER_SUPPORT
-#include "waylandwindowmanagerintegration.h"
-#endif
-
 QT_BEGIN_NAMESPACE
 
 namespace QtWayland {
diff --git a/src/compositor/windowmanagerprotocol/waylandwindowmanagerintegration.cpp b/src/compositor/windowmanagerprotocol/waylandwindowmanagerintegration.cpp
index f2fa21407..7105c7026 100644
--- a/src/compositor/windowmanagerprotocol/waylandwindowmanagerintegration.cpp
+++ b/src/compositor/windowmanagerprotocol/waylandwindowmanagerintegration.cpp
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-#include "waylandwindowmanagerintegration.h"
+#include <windowmanagerprotocol/waylandwindowmanagerintegration_p.h>
 
 #include <wayland_wrapper/qwldisplay_p.h>
 #include <wayland_wrapper/qwlcompositor_p.h>
diff --git a/src/compositor/windowmanagerprotocol/waylandwindowmanagerintegration.h b/src/compositor/windowmanagerprotocol/waylandwindowmanagerintegration_p.h
index 4b2a753ee..4b2a753ee 100644
--- a/src/compositor/windowmanagerprotocol/waylandwindowmanagerintegration.h
+++ b/src/compositor/windowmanagerprotocol/waylandwindowmanagerintegration_p.h
diff --git a/src/compositor/windowmanagerprotocol/windowmanagerprotocol.pri b/src/compositor/windowmanagerprotocol/windowmanagerprotocol.pri
index 7b35c7b79..da3f2529c 100644
--- a/src/compositor/windowmanagerprotocol/windowmanagerprotocol.pri
+++ b/src/compositor/windowmanagerprotocol/windowmanagerprotocol.pri
@@ -1,7 +1,7 @@
 INCLUDEPATH += $$PWD
 
 HEADERS += \
-    windowmanagerprotocol/waylandwindowmanagerintegration.h
+    windowmanagerprotocol/waylandwindowmanagerintegration_p.h
 
 SOURCES += \
     windowmanagerprotocol/waylandwindowmanagerintegration.cpp
diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro
index 1d7d930c9..822fdeb88 100644
--- a/tests/auto/auto.pro
+++ b/tests/auto/auto.pro
@@ -5,4 +5,5 @@ TEMPLATE=subdirs
 contains(CONFIG, wayland-compositor) {
     SUBDIRS += compositor
     SUBDIRS += client
+    SUBDIRS += cmake
 }
diff --git a/tests/auto/cmake/CMakeLists.txt b/tests/auto/cmake/CMakeLists.txt
new file mode 100644
index 000000000..a3c4870d1
--- /dev/null
+++ b/tests/auto/cmake/CMakeLists.txt
@@ -0,0 +1,15 @@
+
+cmake_minimum_required(VERSION 2.8)
+
+project(qmake_cmake_files)
+
+enable_testing()
+
+find_package(Qt5Core REQUIRED)
+set(Qt5_MODULE_TEST_DEPENDS Quick)
+
+include("${_Qt5CTestMacros}")
+
+test_module_includes(
+  Compositor QWaylandBufferRef
+)
diff --git a/tests/auto/cmake/cmake.pro b/tests/auto/cmake/cmake.pro
new file mode 100644
index 000000000..5098c2ce4
--- /dev/null
+++ b/tests/auto/cmake/cmake.pro
@@ -0,0 +1,6 @@
+# Cause make to do nothing.
+TEMPLATE = subdirs
+
+CMAKE_QT_MODULES_UNDER_TEST = waylandclient
+
+CONFIG += ctest_testcase