From d675004dbac12a938cf60fac39e5b9b81bbb6a99 Mon Sep 17 00:00:00 2001 From: Sebastian Holtermann Date: Fri, 25 Nov 2016 13:19:32 +0100 Subject: [PATCH] QtAutogen tests: Rename uiconly target to camel case uicOnly Also move uicOnly sources to dedicated uicOnlySource directory. --- Tests/QtAutogen/CMakeLists.txt | 10 ++++++---- Tests/QtAutogen/{sub => uicOnlySource}/uiconly.cpp | 0 Tests/QtAutogen/{sub => uicOnlySource}/uiconly.h | 0 Tests/QtAutogen/{sub => uicOnlySource}/uiconly.ui | 0 4 files changed, 6 insertions(+), 4 deletions(-) rename Tests/QtAutogen/{sub => uicOnlySource}/uiconly.cpp (100%) rename Tests/QtAutogen/{sub => uicOnlySource}/uiconly.h (100%) rename Tests/QtAutogen/{sub => uicOnlySource}/uiconly.ui (100%) diff --git a/Tests/QtAutogen/CMakeLists.txt b/Tests/QtAutogen/CMakeLists.txt index b0bc10089a..6a5d7b501e 100644 --- a/Tests/QtAutogen/CMakeLists.txt +++ b/Tests/QtAutogen/CMakeLists.txt @@ -54,6 +54,12 @@ add_executable(rccEmpty rccEmpty.cpp rccEmptyRes.qrc) set_property(TARGET rccEmpty PROPERTY AUTORCC ON) target_link_libraries(rccEmpty ${QT_QTCORE_TARGET}) +# -- Test: UIC only +qtx_wrap_cpp(uicOnlyMoc uicOnlySource/uiconly.h) +add_executable(uicOnly uicOnlySource/uiconly.cpp ${uicOnlyMoc}) +set_property(TARGET uicOnly PROPERTY AUTOUIC ON) +target_link_libraries(uicOnly ${QT_LIBRARIES}) + include_directories(${CMAKE_CURRENT_BINARY_DIR}) add_definitions(-DFOO -DSomeDefine="Barx") @@ -147,10 +153,6 @@ target_link_libraries(empty no_link_language) add_library(no_link_language STATIC empty.h) set_target_properties(no_link_language PROPERTIES AUTOMOC TRUE) -qtx_wrap_cpp(uicOnlyMoc sub/uiconly.h) -add_executable(uiconly sub/uiconly.cpp ${uicOnlyMoc}) -target_link_libraries(uiconly ${QT_LIBRARIES}) - try_compile(RCC_DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/autorcc_depends" "${CMAKE_CURRENT_SOURCE_DIR}/autorcc_depends" diff --git a/Tests/QtAutogen/sub/uiconly.cpp b/Tests/QtAutogen/uicOnlySource/uiconly.cpp similarity index 100% rename from Tests/QtAutogen/sub/uiconly.cpp rename to Tests/QtAutogen/uicOnlySource/uiconly.cpp diff --git a/Tests/QtAutogen/sub/uiconly.h b/Tests/QtAutogen/uicOnlySource/uiconly.h similarity index 100% rename from Tests/QtAutogen/sub/uiconly.h rename to Tests/QtAutogen/uicOnlySource/uiconly.h diff --git a/Tests/QtAutogen/sub/uiconly.ui b/Tests/QtAutogen/uicOnlySource/uiconly.ui similarity index 100% rename from Tests/QtAutogen/sub/uiconly.ui rename to Tests/QtAutogen/uicOnlySource/uiconly.ui