From db5b3afa0123bedb25ffef11bf6347f9c63caae9 Mon Sep 17 00:00:00 2001 From: Stephen Kelly Date: Mon, 5 Dec 2011 02:19:55 +0100 Subject: Test the qt5_add_resource macro. Change-Id: I94e4c9e525016405abba90bbdbe58e7786ce5bc4 Reviewed-by: Clinton Stimpson Reviewed-by: Stephen Kelly --- tests/manual/cmake/pass2/CMakeLists.txt | 4 +++- tests/manual/cmake/pass2/myobject.cpp | 2 ++ tests/manual/cmake/pass2/pass2.qrc | 6 ++++++ tests/manual/cmake/pass2/resource_file.txt | 1 + 4 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 tests/manual/cmake/pass2/pass2.qrc create mode 100644 tests/manual/cmake/pass2/resource_file.txt (limited to 'tests/manual/cmake') diff --git a/tests/manual/cmake/pass2/CMakeLists.txt b/tests/manual/cmake/pass2/CMakeLists.txt index 153b038c02..ac1bb15846 100644 --- a/tests/manual/cmake/pass2/CMakeLists.txt +++ b/tests/manual/cmake/pass2/CMakeLists.txt @@ -9,5 +9,7 @@ include_directories(${Qt5Core_INCLUDE_DIRS}) qt5_wrap_cpp(moc_files myobject.h) -add_executable(myobject myobject.cpp ${moc_files}) +qt5_add_resources(rcc_files "pass2.qrc") + +add_executable(myobject myobject.cpp ${moc_files} ${rcc_files}) target_link_libraries(myobject ${Qt5Core_LIBRARIES}) diff --git a/tests/manual/cmake/pass2/myobject.cpp b/tests/manual/cmake/pass2/myobject.cpp index 251239cde0..0f3d8b5b50 100644 --- a/tests/manual/cmake/pass2/myobject.cpp +++ b/tests/manual/cmake/pass2/myobject.cpp @@ -50,5 +50,7 @@ MyObject::MyObject(QObject *parent) int main(int argc, char **argv) { MyObject myObject; + // Compile error if the resource file was not created. + Q_INIT_RESOURCE(pass2); return 0; } diff --git a/tests/manual/cmake/pass2/pass2.qrc b/tests/manual/cmake/pass2/pass2.qrc new file mode 100644 index 0000000000..00a17f541f --- /dev/null +++ b/tests/manual/cmake/pass2/pass2.qrc @@ -0,0 +1,6 @@ + + + resource_file.txt + + + diff --git a/tests/manual/cmake/pass2/resource_file.txt b/tests/manual/cmake/pass2/resource_file.txt new file mode 100644 index 0000000000..2c604a4f18 --- /dev/null +++ b/tests/manual/cmake/pass2/resource_file.txt @@ -0,0 +1 @@ +Ken sent me. -- cgit v1.2.3