diff options
| -rw-r--r-- | src/client/client.pro | 1 | ||||
| -rw-r--r-- | tests/auto/cmake/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | tests/auto/cmake/test_waylandclient/CMakeLists.txt | 12 | ||||
| -rw-r--r-- | tests/auto/cmake/test_waylandclient/main.cpp | 7 |
4 files changed, 22 insertions, 1 deletions
diff --git a/src/client/client.pro b/src/client/client.pro index ba17b21c5..7182f3203 100644 --- a/src/client/client.pro +++ b/src/client/client.pro @@ -16,7 +16,6 @@ load(qt_module) QMAKE_CXXFLAGS_WARN_ON -= -Wcast-qual CONFIG -= precompile_header -CONFIG -= create_cmake CONFIG += link_pkgconfig qpa/genericunixfontdatabase wayland-scanner !equals(QT_WAYLAND_GL_CONFIG, nogl) { 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); +} |