From ee3fe11b023ac3dfb449156db1d3732a70e3ff32 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Wed, 14 Feb 2018 16:47:57 +0100 Subject: Add support for qtquick_compiler_add_resources with cmake builds Change-Id: I2addc2442c51bde6a854e5e9bbb79032e1c9f9bf Reviewed-by: Lars Knoll --- tests/auto/cmake/CMakeLists.txt | 11 +++++++++++ tests/auto/cmake/qtquickcompiler/CMakeLists.txt | 14 ++++++++++++++ tests/auto/cmake/qtquickcompiler/main.cpp | 9 +++++++++ tests/auto/cmake/qtquickcompiler/main.qml | 4 ++++ tests/auto/cmake/qtquickcompiler/qqc_test.qrc | 6 ++++++ 5 files changed, 44 insertions(+) create mode 100644 tests/auto/cmake/qtquickcompiler/CMakeLists.txt create mode 100644 tests/auto/cmake/qtquickcompiler/main.cpp create mode 100644 tests/auto/cmake/qtquickcompiler/main.qml create mode 100644 tests/auto/cmake/qtquickcompiler/qqc_test.qrc (limited to 'tests/auto/cmake') diff --git a/tests/auto/cmake/CMakeLists.txt b/tests/auto/cmake/CMakeLists.txt index 4b9fbe75ac..4d4d8e3db7 100644 --- a/tests/auto/cmake/CMakeLists.txt +++ b/tests/auto/cmake/CMakeLists.txt @@ -15,3 +15,14 @@ test_module_includes( ) expect_pass(test_plugins) + +add_test(qtquickcompiler ${CMAKE_CTEST_COMMAND} + --build-and-test + "${CMAKE_CURRENT_SOURCE_DIR}/qtquickcompiler/" + "${CMAKE_CURRENT_BINARY_DIR}/qtquickcompiler" + --build-config "${CMAKE_BUILD_TYPE}" + --build-generator ${CMAKE_GENERATOR} + --build-makeprogram ${CMAKE_MAKE_PROGRAM} + --build-project qqc_test + --build-options "-DCMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH}" ${BUILD_OPTIONS_LIST} +) diff --git a/tests/auto/cmake/qtquickcompiler/CMakeLists.txt b/tests/auto/cmake/qtquickcompiler/CMakeLists.txt new file mode 100644 index 0000000000..6dee1e25dc --- /dev/null +++ b/tests/auto/cmake/qtquickcompiler/CMakeLists.txt @@ -0,0 +1,14 @@ + +cmake_minimum_required(VERSION 2.8) +project(qqc_test) + +find_package(Qt5Qml 5.0.0 REQUIRED) +find_package(Qt5Gui 5.0.0 REQUIRED) +find_package(Qt5QuickCompiler) + +set(CMAKE_CXXFLAGS "${CMAKE_CXXFLAGS} ${Qt5Core_EXECUTABLE_COMPILE_FLAGS}") + +qtquick_compiler_add_resources(RESOURCES qqc_test.qrc) + +add_executable(qqc_test "${CMAKE_CURRENT_SOURCE_DIR}/main.cpp" ${RESOURCES}) +target_link_libraries(qqc_test Qt5::Gui Qt5::Qml) diff --git a/tests/auto/cmake/qtquickcompiler/main.cpp b/tests/auto/cmake/qtquickcompiler/main.cpp new file mode 100644 index 0000000000..47fc709c0a --- /dev/null +++ b/tests/auto/cmake/qtquickcompiler/main.cpp @@ -0,0 +1,9 @@ + +#include +#include + +int main(int argc, char **argv) +{ + QGuiApplication app(argc, argv); + return app.exec(); +} diff --git a/tests/auto/cmake/qtquickcompiler/main.qml b/tests/auto/cmake/qtquickcompiler/main.qml new file mode 100644 index 0000000000..1f146d89c3 --- /dev/null +++ b/tests/auto/cmake/qtquickcompiler/main.qml @@ -0,0 +1,4 @@ +import QtQml 2.0 +QtObject { + property bool success: 42 +} diff --git a/tests/auto/cmake/qtquickcompiler/qqc_test.qrc b/tests/auto/cmake/qtquickcompiler/qqc_test.qrc new file mode 100644 index 0000000000..f128b7004b --- /dev/null +++ b/tests/auto/cmake/qtquickcompiler/qqc_test.qrc @@ -0,0 +1,6 @@ + + +./main.qml +./main.cpp + + -- cgit v1.2.3