diff options
| author | Stephen Kelly <stephen.kelly@kdab.com> | 2011-12-05 02:19:55 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-12-06 16:56:54 +0100 |
| commit | db5b3afa0123bedb25ffef11bf6347f9c63caae9 (patch) | |
| tree | 23a226c8e8ca74a4fbfd47721afcc32791b304c7 /tests/manual/cmake | |
| parent | 38ca60985ebbda9288a85c647ef0081a425394b6 (diff) | |
Test the qt5_add_resource macro.
Change-Id: I94e4c9e525016405abba90bbdbe58e7786ce5bc4
Reviewed-by: Clinton Stimpson <clinton@elemtech.com>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
Diffstat (limited to 'tests/manual/cmake')
| -rw-r--r-- | tests/manual/cmake/pass2/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | tests/manual/cmake/pass2/myobject.cpp | 2 | ||||
| -rw-r--r-- | tests/manual/cmake/pass2/pass2.qrc | 6 | ||||
| -rw-r--r-- | tests/manual/cmake/pass2/resource_file.txt | 1 |
4 files changed, 12 insertions, 1 deletions
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 @@ +<!DOCTYPE RCC><RCC version="1.0"> +<qresource prefix="/"> + <file>resource_file.txt</file> +</qresource> +</RCC> + 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. |