aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto/cmake
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@qt.io>2018-02-14 16:47:57 +0100
committerSimon Hausmann <simon.hausmann@qt.io>2018-02-15 14:59:45 +0000
commitee3fe11b023ac3dfb449156db1d3732a70e3ff32 (patch)
treeca4ef15e153cd8418811f69cbf1292015c91de4f /tests/auto/cmake
parent16ca5eab9bdd31774dc8e657f217e044640eecff (diff)
Add support for qtquick_compiler_add_resources with cmake builds
Change-Id: I2addc2442c51bde6a854e5e9bbb79032e1c9f9bf Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'tests/auto/cmake')
-rw-r--r--tests/auto/cmake/CMakeLists.txt11
-rw-r--r--tests/auto/cmake/qtquickcompiler/CMakeLists.txt14
-rw-r--r--tests/auto/cmake/qtquickcompiler/main.cpp9
-rw-r--r--tests/auto/cmake/qtquickcompiler/main.qml4
-rw-r--r--tests/auto/cmake/qtquickcompiler/qqc_test.qrc6
5 files changed, 44 insertions, 0 deletions
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 <QtGui>
+#include <QtQml>
+
+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 @@
+<!DOCTYPE RCC><RCC version="1.0">
+<qresource>
+<file>./main.qml</file>
+<file>./main.cpp</file>
+</qresource>
+</RCC>