diff options
| author | Sebastian Holtermann <sebholt@xwmw.org> | 2016-11-25 11:28:02 (GMT) |
|---|---|---|
| committer | Sebastian Holtermann <sebholt@xwmw.org> | 2016-11-29 16:16:33 (GMT) |
| commit | 59dbd3f891ed79d56df468235c47be3538be734d (patch) | |
| tree | 8b9377eba91b5e03176a1f1abedabed53e5a28c3 | |
| parent | 6eb654c06e7efbbf27d3be220078561b3e9da968 (diff) | |
| download | CMake-59dbd3f891ed79d56df468235c47be3538be734d.zip CMake-59dbd3f891ed79d56df468235c47be3538be734d.tar.gz CMake-59dbd3f891ed79d56df468235c47be3538be734d.tar.bz2 | |
QtAutogen tests: Rename rcconly target to camel case rccOnly.
Also add dedicated rccOnlyRes.qrc file for the rccOnly target.
| -rw-r--r-- | Tests/QtAutogen/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | Tests/QtAutogen/rccOnly.cpp (renamed from Tests/QtAutogen/rcconly.cpp) | 4 | ||||
| -rw-r--r-- | Tests/QtAutogen/rccOnlyRes.qrc | 5 |
3 files changed, 11 insertions, 6 deletions
diff --git a/Tests/QtAutogen/CMakeLists.txt b/Tests/QtAutogen/CMakeLists.txt index c713d1c..44c8a33 100644 --- a/Tests/QtAutogen/CMakeLists.txt +++ b/Tests/QtAutogen/CMakeLists.txt @@ -44,10 +44,10 @@ else() endif() -# -- RCC only -add_executable(rcconly rcconly.cpp second_resource.qrc) -set_property(TARGET rcconly PROPERTY AUTORCC ON) -target_link_libraries(rcconly ${QT_QTCORE_TARGET}) +# -- Test: RCC only +add_executable(rccOnly rccOnly.cpp rccOnlyRes.qrc) +set_property(TARGET rccOnly PROPERTY AUTORCC ON) +target_link_libraries(rccOnly ${QT_QTCORE_TARGET}) # -- RCC empty add_executable(rcc_empty rcc_empty.cpp rcc_empty_resource.qrc) diff --git a/Tests/QtAutogen/rcconly.cpp b/Tests/QtAutogen/rccOnly.cpp index 854c4c1..61c7bf4 100644 --- a/Tests/QtAutogen/rcconly.cpp +++ b/Tests/QtAutogen/rccOnly.cpp @@ -1,9 +1,9 @@ -extern int qInitResources_second_resource(); +extern int qInitResources_rccOnlyRes(); int main(int, char**) { // Fails to link if the symbol is not present. - qInitResources_second_resource(); + qInitResources_rccOnlyRes(); return 0; } diff --git a/Tests/QtAutogen/rccOnlyRes.qrc b/Tests/QtAutogen/rccOnlyRes.qrc new file mode 100644 index 0000000..5551348 --- /dev/null +++ b/Tests/QtAutogen/rccOnlyRes.qrc @@ -0,0 +1,5 @@ +<!DOCTYPE RCC><RCC version="1.0"> +<qresource> + <file>rccOnly.cpp</file> +</qresource> +</RCC> |