Merge remote-tracking branch 'qt/5.6' into wip-compositor-api

Change-Id: Ie70fdd03e1259a8cb75bbdbf1324e3e4a2b51807

3 files changed, 22 insertions, 0 deletions

diff --git a/tests/auto/cmake/CMakeLists.txt b/tests/auto/cmake/CMakeLists.txt
index a3c4870d1..9041fff95 100644
--- a/tests/auto/cmake/CMakeLists.txt
+++ b/tests/auto/cmake/CMakeLists.txt
@@ -13,3 +13,6 @@ include("${_Qt5CTestMacros}")
 test_module_includes(
   Compositor QWaylandBufferRef
 )
+
+# Can't test in `test_module_includes`, WaylandClient has no public headers
+expect_pass(test_waylandclient)
diff --git a/tests/auto/cmake/test_waylandclient/CMakeLists.txt b/tests/auto/cmake/test_waylandclient/CMakeLists.txt
new file mode 100644
index 000000000..3788a4927
--- /dev/null
+++ b/tests/auto/cmake/test_waylandclient/CMakeLists.txt
@@ -0,0 +1,12 @@
+project(test_plugins)
+
+cmake_minimum_required(VERSION 2.8)
+cmake_policy(SET CMP0056 NEW)
+
+find_package(Qt5WaylandClient REQUIRED)
+
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5Core_EXECUTABLE_COMPILE_FLAGS}")
+
+include_directories(${Qt5WaylandClient_PRIVATE_INCLUDE_DIRS})
+add_executable(test_waylandclient_exe main.cpp)
+target_link_libraries(test_waylandclient_exe Qt5::WaylandClient)
diff --git a/tests/auto/cmake/test_waylandclient/main.cpp b/tests/auto/cmake/test_waylandclient/main.cpp
new file mode 100644
index 000000000..f0ccdef4b
--- /dev/null
+++ b/tests/auto/cmake/test_waylandclient/main.cpp
@@ -0,0 +1,7 @@
+#include <private/qwaylandcursor_p.h>
+
+int main()
+{
+    // use symbol
+    QtWaylandClient::QWaylandCursor cursor(Q_NULLPTR);
+}