From 59dbd3f891ed79d56df468235c47be3538be734d Mon Sep 17 00:00:00 2001 From: Sebastian Holtermann Date: Fri, 25 Nov 2016 12:28:02 +0100 Subject: QtAutogen tests: Rename rcconly target to camel case rccOnly. Also add dedicated rccOnlyRes.qrc file for the rccOnly target. --- Tests/QtAutogen/CMakeLists.txt | 8 ++++---- Tests/QtAutogen/rccOnly.cpp | 9 +++++++++ Tests/QtAutogen/rccOnlyRes.qrc | 5 +++++ Tests/QtAutogen/rcconly.cpp | 9 --------- 4 files changed, 18 insertions(+), 13 deletions(-) create mode 100644 Tests/QtAutogen/rccOnly.cpp create mode 100644 Tests/QtAutogen/rccOnlyRes.qrc delete mode 100644 Tests/QtAutogen/rcconly.cpp 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 new file mode 100644 index 0000000..61c7bf4 --- /dev/null +++ b/Tests/QtAutogen/rccOnly.cpp @@ -0,0 +1,9 @@ + +extern int qInitResources_rccOnlyRes(); + +int main(int, char**) +{ + // Fails to link if the symbol is not present. + 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 @@ + + + rccOnly.cpp + + diff --git a/Tests/QtAutogen/rcconly.cpp b/Tests/QtAutogen/rcconly.cpp deleted file mode 100644 index 854c4c1..0000000 --- a/Tests/QtAutogen/rcconly.cpp +++ /dev/null @@ -1,9 +0,0 @@ - -extern int qInitResources_second_resource(); - -int main(int, char**) -{ - // Fails to link if the symbol is not present. - qInitResources_second_resource(); - return 0; -} -- cgit v0.12