From cb4bc19ae1b2f61165543ef926037936b179414d Mon Sep 17 00:00:00 2001 From: Sebastian Holtermann Date: Fri, 25 Nov 2016 12:41:16 +0100 Subject: QtAutogen tests: Rename rcc_empty target to camel case rccEmpty --- Tests/QtAutogen/CMakeLists.txt | 9 ++++----- Tests/QtAutogen/rccEmpty.cpp | 9 +++++++++ Tests/QtAutogen/rccEmptyRes.qrc | 4 ++++ Tests/QtAutogen/rcc_empty.cpp | 9 --------- Tests/QtAutogen/rcc_empty_resource.qrc | 4 ---- 5 files changed, 17 insertions(+), 18 deletions(-) create mode 100644 Tests/QtAutogen/rccEmpty.cpp create mode 100644 Tests/QtAutogen/rccEmptyRes.qrc delete mode 100644 Tests/QtAutogen/rcc_empty.cpp delete mode 100644 Tests/QtAutogen/rcc_empty_resource.qrc diff --git a/Tests/QtAutogen/CMakeLists.txt b/Tests/QtAutogen/CMakeLists.txt index 44c8a33..b0bc100 100644 --- a/Tests/QtAutogen/CMakeLists.txt +++ b/Tests/QtAutogen/CMakeLists.txt @@ -49,13 +49,12 @@ 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) -set_property(TARGET rcc_empty PROPERTY AUTORCC ON) -target_link_libraries(rcc_empty ${QT_QTCORE_TARGET}) +# -- Test: RCC empty +add_executable(rccEmpty rccEmpty.cpp rccEmptyRes.qrc) +set_property(TARGET rccEmpty PROPERTY AUTORCC ON) +target_link_libraries(rccEmpty ${QT_QTCORE_TARGET}) include_directories(${CMAKE_CURRENT_BINARY_DIR}) - add_definitions(-DFOO -DSomeDefine="Barx") # enable relaxed mode so automoc can handle all the special cases: diff --git a/Tests/QtAutogen/rccEmpty.cpp b/Tests/QtAutogen/rccEmpty.cpp new file mode 100644 index 0000000..7f2c527 --- /dev/null +++ b/Tests/QtAutogen/rccEmpty.cpp @@ -0,0 +1,9 @@ + +extern int qInitResources_rccEmptyRes(); + +int main(int, char**) +{ + // Fails to link if the symbol is not present. + qInitResources_rccEmptyRes(); + return 0; +} diff --git a/Tests/QtAutogen/rccEmptyRes.qrc b/Tests/QtAutogen/rccEmptyRes.qrc new file mode 100644 index 0000000..4ca9cd5 --- /dev/null +++ b/Tests/QtAutogen/rccEmptyRes.qrc @@ -0,0 +1,4 @@ + + + + diff --git a/Tests/QtAutogen/rcc_empty.cpp b/Tests/QtAutogen/rcc_empty.cpp deleted file mode 100644 index 3f9f9a2..0000000 --- a/Tests/QtAutogen/rcc_empty.cpp +++ /dev/null @@ -1,9 +0,0 @@ - -extern int qInitResources_rcc_empty_resource(); - -int main(int, char**) -{ - // Fails to link if the symbol is not present. - qInitResources_rcc_empty_resource(); - return 0; -} diff --git a/Tests/QtAutogen/rcc_empty_resource.qrc b/Tests/QtAutogen/rcc_empty_resource.qrc deleted file mode 100644 index 4ca9cd5..0000000 --- a/Tests/QtAutogen/rcc_empty_resource.qrc +++ /dev/null @@ -1,4 +0,0 @@ - - - - -- cgit v0.12