From 403213240c7b2dc09378e1cb8c147131e368f90c Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Tue, 22 Sep 2020 10:16:58 +0200 Subject: CMake: Regenerate projects to use new qt_internal_ API Modify special case locations to use the new API as well. Clean up some stale .prev files that are not needed anymore. Clean up some project files that are not used anymore. Task-number: QTBUG-86815 Change-Id: I9947da921f98686023c6bb053dfcc101851276b5 Reviewed-by: Joerg Bornemann Reviewed-by: Qt CI Bot --- src/tools/androiddeployqt/.prev_CMakeLists.txt | 2 +- src/tools/androiddeployqt/CMakeLists.txt | 2 +- src/tools/androidtestrunner/CMakeLists.txt | 2 +- src/tools/bootstrap/.prev_CMakeLists.txt | 20 ++++++++++---------- src/tools/bootstrap/CMakeLists.txt | 20 ++++++++++---------- src/tools/cmake_automoc_parser/CMakeLists.txt | 2 +- src/tools/moc/.prev_CMakeLists.txt | 4 ++-- src/tools/moc/CMakeLists.txt | 4 ++-- src/tools/qdbuscpp2xml/.prev_CMakeLists.txt | 6 +++--- src/tools/qdbuscpp2xml/CMakeLists.txt | 6 +++--- src/tools/qdbusxml2cpp/.prev_CMakeLists.txt | 6 +++--- src/tools/qdbusxml2cpp/CMakeLists.txt | 8 ++++---- src/tools/qlalr/.prev_CMakeLists.txt | 2 +- src/tools/qlalr/CMakeLists.txt | 2 +- src/tools/qvkgen/.prev_CMakeLists.txt | 2 +- src/tools/qvkgen/CMakeLists.txt | 2 +- src/tools/rcc/.prev_CMakeLists.txt | 6 +++--- src/tools/rcc/CMakeLists.txt | 6 +++--- src/tools/tracegen/.prev_CMakeLists.txt | 2 +- src/tools/tracegen/CMakeLists.txt | 2 +- src/tools/uic/.prev_CMakeLists.txt | 2 +- src/tools/uic/CMakeLists.txt | 2 +- 22 files changed, 55 insertions(+), 55 deletions(-) (limited to 'src/tools') diff --git a/src/tools/androiddeployqt/.prev_CMakeLists.txt b/src/tools/androiddeployqt/.prev_CMakeLists.txt index bb644c6fc1..3989e2f506 100644 --- a/src/tools/androiddeployqt/.prev_CMakeLists.txt +++ b/src/tools/androiddeployqt/.prev_CMakeLists.txt @@ -24,7 +24,7 @@ set_target_properties(androiddeployqt PROPERTIES ## Scopes: ##################################################################### -qt_extend_target(androiddeployqt CONDITION windows +qt_internal_extend_target(androiddeployqt CONDITION windows COMPILE_OPTIONS -U__STRICT_ANSI__ ) diff --git a/src/tools/androiddeployqt/CMakeLists.txt b/src/tools/androiddeployqt/CMakeLists.txt index 0a0886fc75..4eec7b8164 100644 --- a/src/tools/androiddeployqt/CMakeLists.txt +++ b/src/tools/androiddeployqt/CMakeLists.txt @@ -24,7 +24,7 @@ set_target_properties(androiddeployqt PROPERTIES ## Scopes: ##################################################################### -qt_extend_target(androiddeployqt CONDITION windows +qt_internal_extend_target(androiddeployqt CONDITION windows COMPILE_OPTIONS -U__STRICT_ANSI__ ) diff --git a/src/tools/androidtestrunner/CMakeLists.txt b/src/tools/androidtestrunner/CMakeLists.txt index 17cf825869..9f6eb600bc 100644 --- a/src/tools/androidtestrunner/CMakeLists.txt +++ b/src/tools/androidtestrunner/CMakeLists.txt @@ -24,7 +24,7 @@ set_target_properties(androidtestrunner PROPERTIES ## Scopes: ##################################################################### -qt_extend_target(androidtestrunner CONDITION windows +qt_internal_extend_target(androidtestrunner CONDITION windows COMPILE_OPTIONS -U__STRICT_ANSI__ ) diff --git a/src/tools/bootstrap/.prev_CMakeLists.txt b/src/tools/bootstrap/.prev_CMakeLists.txt index b42582efd8..bf93a3958d 100644 --- a/src/tools/bootstrap/.prev_CMakeLists.txt +++ b/src/tools/bootstrap/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## Bootstrap Module: ##################################################################### -qt_add_module(Bootstrap +qt_internal_add_module(Bootstrap STATIC INTERNAL_MODULE NO_SYNC_QT @@ -164,7 +164,7 @@ qt_add_module(Bootstrap ## Scopes: ##################################################################### -qt_extend_target(Bootstrap CONDITION UNIX +qt_internal_extend_target(Bootstrap CONDITION UNIX SOURCES ../../corelib/io/qfilesystemengine_unix.cpp ../../corelib/io/qfilesystemiterator_unix.cpp @@ -178,7 +178,7 @@ qt_extend_target(Bootstrap CONDITION UNIX ../../corelib/kernel/qsystemsemaphore_unix.cpp ) -qt_extend_target(Bootstrap CONDITION WIN32 +qt_internal_extend_target(Bootstrap CONDITION WIN32 SOURCES ../../corelib/global/qoperatingsystemversion_win.cpp ../../corelib/io/qfilesystemengine_win.cpp @@ -200,7 +200,7 @@ qt_extend_target(Bootstrap CONDITION WIN32 user32 ) -qt_extend_target(Bootstrap CONDITION APPLE +qt_internal_extend_target(Bootstrap CONDITION APPLE SOURCES ../../corelib/global/qoperatingsystemversion_darwin.mm ../../corelib/kernel/qcore_foundation.mm @@ -210,24 +210,24 @@ qt_extend_target(Bootstrap CONDITION APPLE ${FWFoundation} ) -qt_extend_target(Bootstrap CONDITION MACOS +qt_internal_extend_target(Bootstrap CONDITION MACOS SOURCES ../../corelib/io/qstandardpaths_mac.mm LIBRARIES ${FWCoreServices} ) -qt_extend_target(Bootstrap CONDITION UIKIT +qt_internal_extend_target(Bootstrap CONDITION UIKIT LIBRARIES ${FWUIKit} ) -qt_extend_target(Bootstrap CONDITION UNIX AND NOT MACOS +qt_internal_extend_target(Bootstrap CONDITION UNIX AND NOT MACOS SOURCES ../../corelib/io/qstandardpaths_unix.cpp ) -qt_extend_target(Bootstrap CONDITION CMAKE_CROSSCOMPILING OR NOT QT_FEATURE_system_zlib +qt_internal_extend_target(Bootstrap CONDITION CMAKE_CROSSCOMPILING OR NOT QT_FEATURE_system_zlib SOURCES ../../3rdparty/zlib/src/adler32.c ../../3rdparty/zlib/src/compress.c @@ -248,12 +248,12 @@ qt_extend_target(Bootstrap CONDITION CMAKE_CROSSCOMPILING OR NOT QT_FEATURE_syst ../../3rdparty/zlib/src ) -qt_extend_target(Bootstrap CONDITION QT_FEATURE_system_zlib AND NOT CMAKE_CROSSCOMPILING +qt_internal_extend_target(Bootstrap CONDITION QT_FEATURE_system_zlib AND NOT CMAKE_CROSSCOMPILING LIBRARIES ZLIB::ZLIB ) -qt_extend_target(Bootstrap CONDITION MINGW AND WIN32 +qt_internal_extend_target(Bootstrap CONDITION MINGW AND WIN32 PUBLIC_LIBRARIES uuid ) diff --git a/src/tools/bootstrap/CMakeLists.txt b/src/tools/bootstrap/CMakeLists.txt index fe69c371cb..7669207fdd 100644 --- a/src/tools/bootstrap/CMakeLists.txt +++ b/src/tools/bootstrap/CMakeLists.txt @@ -9,7 +9,7 @@ # libraries. add_library(Bootstrap STATIC) # special case end -qt_extend_target(Bootstrap +qt_internal_extend_target(Bootstrap SOURCES ../../3rdparty/pcre2/src/config.h ../../3rdparty/pcre2/src/pcre2.h @@ -163,7 +163,7 @@ qt_extend_target(Bootstrap ## Scopes: ##################################################################### -qt_extend_target(Bootstrap CONDITION UNIX +qt_internal_extend_target(Bootstrap CONDITION UNIX SOURCES ../../corelib/io/qfilesystemengine_unix.cpp ../../corelib/io/qfilesystemiterator_unix.cpp @@ -177,7 +177,7 @@ qt_extend_target(Bootstrap CONDITION UNIX ../../corelib/kernel/qsystemsemaphore_unix.cpp ) -qt_extend_target(Bootstrap CONDITION WIN32 +qt_internal_extend_target(Bootstrap CONDITION WIN32 SOURCES ../../corelib/global/qoperatingsystemversion_win.cpp ../../corelib/io/qfilesystemengine_win.cpp @@ -199,7 +199,7 @@ qt_extend_target(Bootstrap CONDITION WIN32 user32 ) -qt_extend_target(Bootstrap CONDITION APPLE +qt_internal_extend_target(Bootstrap CONDITION APPLE SOURCES ../../corelib/global/qoperatingsystemversion_darwin.mm ../../corelib/kernel/qcore_foundation.mm @@ -209,24 +209,24 @@ qt_extend_target(Bootstrap CONDITION APPLE ${FWFoundation} ) -qt_extend_target(Bootstrap CONDITION MACOS +qt_internal_extend_target(Bootstrap CONDITION MACOS SOURCES ../../corelib/io/qstandardpaths_mac.mm LIBRARIES ${FWCoreServices} ) -qt_extend_target(Bootstrap CONDITION UIKIT +qt_internal_extend_target(Bootstrap CONDITION UIKIT LIBRARIES ${FWUIKit} ) -qt_extend_target(Bootstrap CONDITION UNIX AND NOT MACOS +qt_internal_extend_target(Bootstrap CONDITION UNIX AND NOT MACOS SOURCES ../../corelib/io/qstandardpaths_unix.cpp ) -qt_extend_target(Bootstrap CONDITION CMAKE_CROSSCOMPILING OR NOT QT_FEATURE_system_zlib +qt_internal_extend_target(Bootstrap CONDITION CMAKE_CROSSCOMPILING OR NOT QT_FEATURE_system_zlib SOURCES ../../3rdparty/zlib/src/adler32.c ../../3rdparty/zlib/src/compress.c @@ -247,12 +247,12 @@ qt_extend_target(Bootstrap CONDITION CMAKE_CROSSCOMPILING OR NOT QT_FEATURE_syst ../../3rdparty/zlib/src ) -qt_extend_target(Bootstrap CONDITION QT_FEATURE_system_zlib AND NOT CMAKE_CROSSCOMPILING +qt_internal_extend_target(Bootstrap CONDITION QT_FEATURE_system_zlib AND NOT CMAKE_CROSSCOMPILING LIBRARIES ZLIB::ZLIB ) -qt_extend_target(Bootstrap CONDITION MINGW AND WIN32 +qt_internal_extend_target(Bootstrap CONDITION MINGW AND WIN32 PUBLIC_LIBRARIES uuid ) diff --git a/src/tools/cmake_automoc_parser/CMakeLists.txt b/src/tools/cmake_automoc_parser/CMakeLists.txt index 39683d57e4..31bef236e8 100644 --- a/src/tools/cmake_automoc_parser/CMakeLists.txt +++ b/src/tools/cmake_automoc_parser/CMakeLists.txt @@ -3,7 +3,7 @@ ##################################################################### qt_get_tool_target_name(target_name cmake_automoc_parser) -qt_add_tool(${target_name} +qt_internal_add_tool(${target_name} BOOTSTRAP TOOLS_TARGET Core # special case SOURCES diff --git a/src/tools/moc/.prev_CMakeLists.txt b/src/tools/moc/.prev_CMakeLists.txt index f3688020f6..572acc4f36 100644 --- a/src/tools/moc/.prev_CMakeLists.txt +++ b/src/tools/moc/.prev_CMakeLists.txt @@ -5,7 +5,7 @@ ##################################################################### qt_get_tool_target_name(target_name moc) -qt_add_tool(${target_name} +qt_internal_add_tool(${target_name} BOOTSTRAP TARGET_DESCRIPTION "Qt Meta Object Compiler" SOURCES @@ -39,7 +39,7 @@ qt_add_tool(${target_name} ## Scopes: ##################################################################### -qt_extend_target(${target_name} CONDITION MSVC +qt_internal_extend_target(${target_name} CONDITION MSVC DEFINES _CRT_SECURE_NO_WARNINGS ) diff --git a/src/tools/moc/CMakeLists.txt b/src/tools/moc/CMakeLists.txt index 91c9d89cea..53fc4ff73b 100644 --- a/src/tools/moc/CMakeLists.txt +++ b/src/tools/moc/CMakeLists.txt @@ -5,7 +5,7 @@ ##################################################################### qt_get_tool_target_name(target_name moc) -qt_add_tool(${target_name} +qt_internal_add_tool(${target_name} BOOTSTRAP TARGET_DESCRIPTION "Qt Meta Object Compiler" TOOLS_TARGET Core # special case @@ -40,7 +40,7 @@ qt_add_tool(${target_name} ## Scopes: ##################################################################### -qt_extend_target(${target_name} CONDITION MSVC +qt_internal_extend_target(${target_name} CONDITION MSVC DEFINES _CRT_SECURE_NO_WARNINGS ) diff --git a/src/tools/qdbuscpp2xml/.prev_CMakeLists.txt b/src/tools/qdbuscpp2xml/.prev_CMakeLists.txt index fa02b5753c..2b1def9f56 100644 --- a/src/tools/qdbuscpp2xml/.prev_CMakeLists.txt +++ b/src/tools/qdbuscpp2xml/.prev_CMakeLists.txt @@ -5,7 +5,7 @@ ##################################################################### qt_get_tool_target_name(target_name qdbuscpp2xml) -qt_add_tool(${target_name} +qt_internal_add_tool(${target_name} TARGET_DESCRIPTION "Qt D-Bus C++ to XML Compiler" SOURCES ../moc/cbordevice.h @@ -36,12 +36,12 @@ qt_add_tool(${target_name} ## Scopes: ##################################################################### -qt_extend_target(${target_name} CONDITION force_bootstrap +qt_internal_extend_target(${target_name} CONDITION force_bootstrap PUBLIC_LIBRARIES bootstrap_dbusPrivate ) -qt_extend_target(${target_name} CONDITION NOT force_bootstrap +qt_internal_extend_target(${target_name} CONDITION NOT force_bootstrap PUBLIC_LIBRARIES Qt::DBusPrivate ) diff --git a/src/tools/qdbuscpp2xml/CMakeLists.txt b/src/tools/qdbuscpp2xml/CMakeLists.txt index e831d5f392..865995755b 100644 --- a/src/tools/qdbuscpp2xml/CMakeLists.txt +++ b/src/tools/qdbuscpp2xml/CMakeLists.txt @@ -5,7 +5,7 @@ ##################################################################### qt_get_tool_target_name(target_name qdbuscpp2xml) -qt_add_tool(${target_name} +qt_internal_add_tool(${target_name} TARGET_DESCRIPTION "Qt D-Bus C++ to XML Compiler" TOOLS_TARGET DBus # special case SOURCES @@ -44,6 +44,6 @@ qt_add_tool(${target_name} ##################################################################### # special case begin -# extend_target(qdbuscpp2xml CONDITION force_bootstrap [...]) -# extend_target(qdbuscpp2xml CONDITION NOT force_bootstrap [...]) +# qt_internal_extend_target(qdbuscpp2xml CONDITION force_bootstrap [...]) +# qt_internal_extend_target(qdbuscpp2xml CONDITION NOT force_bootstrap [...]) # special case end diff --git a/src/tools/qdbusxml2cpp/.prev_CMakeLists.txt b/src/tools/qdbusxml2cpp/.prev_CMakeLists.txt index 603c21ac1e..ad04ca2d3f 100644 --- a/src/tools/qdbusxml2cpp/.prev_CMakeLists.txt +++ b/src/tools/qdbusxml2cpp/.prev_CMakeLists.txt @@ -5,7 +5,7 @@ ##################################################################### qt_get_tool_target_name(target_name qdbusxml2cpp) -qt_add_tool(${target_name} +qt_internal_add_tool(${target_name} TARGET_DESCRIPTION "Qt D-Bus XML to C++ Compiler" SOURCES qdbusxml2cpp.cpp @@ -23,12 +23,12 @@ qt_add_tool(${target_name} ## Scopes: ##################################################################### -qt_extend_target(${target_name} CONDITION NOT force_bootstrap +qt_internal_extend_target(${target_name} CONDITION NOT force_bootstrap PUBLIC_LIBRARIES Qt::DBusPrivate ) -qt_extend_target(${target_name} CONDITION force_bootstrap +qt_internal_extend_target(${target_name} CONDITION force_bootstrap PUBLIC_LIBRARIES bootstrap_dbusPrivate ) diff --git a/src/tools/qdbusxml2cpp/CMakeLists.txt b/src/tools/qdbusxml2cpp/CMakeLists.txt index 5b58975afe..37327b34db 100644 --- a/src/tools/qdbusxml2cpp/CMakeLists.txt +++ b/src/tools/qdbusxml2cpp/CMakeLists.txt @@ -5,7 +5,7 @@ ##################################################################### qt_get_tool_target_name(target_name qdbusxml2cpp) -qt_add_tool(${target_name} +qt_internal_add_tool(${target_name} TARGET_DESCRIPTION "Qt D-Bus XML to C++ Compiler" TOOLS_TARGET DBus # special case SOURCES @@ -31,7 +31,7 @@ qt_add_tool(${target_name} ##################################################################### # special case begin -# extend_target(qdbusxml2cpp CONDITION NOT force_bootstrap [...]) -# extend_target(qdbusxml2cpp CONDITION NOT QT_FEATURE_commandlineparser AND NOT force_bootstrap [...]) -# extend_target(qdbusxml2cpp CONDITION force_bootstrap [...]) +# qt_internal_extend_target(qdbusxml2cpp CONDITION NOT force_bootstrap [...]) +# qt_internal_extend_target(qdbusxml2cpp CONDITION NOT QT_FEATURE_commandlineparser AND NOT force_bootstrap [...]) +# qt_internal_extend_target(qdbusxml2cpp CONDITION force_bootstrap [...]) # special case end diff --git a/src/tools/qlalr/.prev_CMakeLists.txt b/src/tools/qlalr/.prev_CMakeLists.txt index 00c4abc0cd..fecc431731 100644 --- a/src/tools/qlalr/.prev_CMakeLists.txt +++ b/src/tools/qlalr/.prev_CMakeLists.txt @@ -5,7 +5,7 @@ ##################################################################### qt_get_tool_target_name(target_name qlalr) -qt_add_tool(${target_name} +qt_internal_add_tool(${target_name} TARGET_DESCRIPTION "Qt Look Ahead LR Parser Generator" SOURCES compress.cpp compress.h diff --git a/src/tools/qlalr/CMakeLists.txt b/src/tools/qlalr/CMakeLists.txt index b0137d4918..b3dd7c28b7 100644 --- a/src/tools/qlalr/CMakeLists.txt +++ b/src/tools/qlalr/CMakeLists.txt @@ -5,7 +5,7 @@ ##################################################################### qt_get_tool_target_name(target_name qlalr) -qt_add_tool(${target_name} +qt_internal_add_tool(${target_name} TARGET_DESCRIPTION "Qt Look Ahead LR Parser Generator" TOOLS_TARGET Core # special case SOURCES diff --git a/src/tools/qvkgen/.prev_CMakeLists.txt b/src/tools/qvkgen/.prev_CMakeLists.txt index ed8c028686..a735b31a05 100644 --- a/src/tools/qvkgen/.prev_CMakeLists.txt +++ b/src/tools/qvkgen/.prev_CMakeLists.txt @@ -5,7 +5,7 @@ ##################################################################### qt_get_tool_target_name(target_name qvkgen) -qt_add_tool(${target_name} +qt_internal_add_tool(${target_name} TARGET_DESCRIPTION "Qt Vulkan Header Generator" SOURCES qvkgen.cpp diff --git a/src/tools/qvkgen/CMakeLists.txt b/src/tools/qvkgen/CMakeLists.txt index 003b407fdc..a6d264d53e 100644 --- a/src/tools/qvkgen/CMakeLists.txt +++ b/src/tools/qvkgen/CMakeLists.txt @@ -5,7 +5,7 @@ ##################################################################### qt_get_tool_target_name(target_name qvkgen) -qt_add_tool(${target_name} +qt_internal_add_tool(${target_name} TARGET_DESCRIPTION "Qt Vulkan Header Generator" TOOLS_TARGET Gui # special case SOURCES diff --git a/src/tools/rcc/.prev_CMakeLists.txt b/src/tools/rcc/.prev_CMakeLists.txt index 7b2eff21c3..cd10a9b50c 100644 --- a/src/tools/rcc/.prev_CMakeLists.txt +++ b/src/tools/rcc/.prev_CMakeLists.txt @@ -5,7 +5,7 @@ ##################################################################### qt_get_tool_target_name(target_name rcc) -qt_add_tool(${target_name} +qt_internal_add_tool(${target_name} BOOTSTRAP TARGET_DESCRIPTION "Qt Resource Compiler" SOURCES @@ -26,14 +26,14 @@ qt_add_tool(${target_name} ## Scopes: ##################################################################### -qt_extend_target(${target_name} CONDITION QT_FEATURE_zstd AND NOT CMAKE_CROSSCOMPILING +qt_internal_extend_target(${target_name} CONDITION QT_FEATURE_zstd AND NOT CMAKE_CROSSCOMPILING DEFINES QT_FEATURE_zstd=1 LIBRARIES ZSTD::ZSTD ) -qt_extend_target(${target_name} CONDITION CMAKE_CROSSCOMPILING OR NOT QT_FEATURE_zstd +qt_internal_extend_target(${target_name} CONDITION CMAKE_CROSSCOMPILING OR NOT QT_FEATURE_zstd DEFINES QT_FEATURE_zstd=-1 ) diff --git a/src/tools/rcc/CMakeLists.txt b/src/tools/rcc/CMakeLists.txt index 4b71695d47..f9bb7025a2 100644 --- a/src/tools/rcc/CMakeLists.txt +++ b/src/tools/rcc/CMakeLists.txt @@ -5,7 +5,7 @@ ##################################################################### qt_get_tool_target_name(target_name rcc) -qt_add_tool(${target_name} +qt_internal_add_tool(${target_name} BOOTSTRAP TARGET_DESCRIPTION "Qt Resource Compiler" TOOLS_TARGET Core # special case @@ -27,14 +27,14 @@ qt_add_tool(${target_name} ## Scopes: ##################################################################### -qt_extend_target(${target_name} CONDITION QT_FEATURE_zstd AND NOT CMAKE_CROSSCOMPILING +qt_internal_extend_target(${target_name} CONDITION QT_FEATURE_zstd AND NOT CMAKE_CROSSCOMPILING DEFINES QT_FEATURE_zstd=1 LIBRARIES ZSTD::ZSTD ) -qt_extend_target(${target_name} CONDITION CMAKE_CROSSCOMPILING OR NOT QT_FEATURE_zstd +qt_internal_extend_target(${target_name} CONDITION CMAKE_CROSSCOMPILING OR NOT QT_FEATURE_zstd DEFINES QT_FEATURE_zstd=-1 ) diff --git a/src/tools/tracegen/.prev_CMakeLists.txt b/src/tools/tracegen/.prev_CMakeLists.txt index dbb673216f..51dde9f7cc 100644 --- a/src/tools/tracegen/.prev_CMakeLists.txt +++ b/src/tools/tracegen/.prev_CMakeLists.txt @@ -5,7 +5,7 @@ ##################################################################### qt_get_tool_target_name(target_name tracegen) -qt_add_tool(${target_name} +qt_internal_add_tool(${target_name} BOOTSTRAP SOURCES etw.cpp etw.h diff --git a/src/tools/tracegen/CMakeLists.txt b/src/tools/tracegen/CMakeLists.txt index 678b46cb21..ac1e11c974 100644 --- a/src/tools/tracegen/CMakeLists.txt +++ b/src/tools/tracegen/CMakeLists.txt @@ -5,7 +5,7 @@ ##################################################################### qt_get_tool_target_name(target_name tracegen) -qt_add_tool(${target_name} +qt_internal_add_tool(${target_name} BOOTSTRAP TOOLS_TARGET Core # special case SOURCES diff --git a/src/tools/uic/.prev_CMakeLists.txt b/src/tools/uic/.prev_CMakeLists.txt index eb5a82572e..20c5e1a7c6 100644 --- a/src/tools/uic/.prev_CMakeLists.txt +++ b/src/tools/uic/.prev_CMakeLists.txt @@ -5,7 +5,7 @@ ##################################################################### qt_get_tool_target_name(target_name uic) -qt_add_tool(${target_name} +qt_internal_add_tool(${target_name} TARGET_DESCRIPTION "Qt User Interface Compiler" SOURCES cpp/cppwritedeclaration.cpp cpp/cppwritedeclaration.h diff --git a/src/tools/uic/CMakeLists.txt b/src/tools/uic/CMakeLists.txt index c25b53f7d3..afda54d179 100644 --- a/src/tools/uic/CMakeLists.txt +++ b/src/tools/uic/CMakeLists.txt @@ -5,7 +5,7 @@ ##################################################################### qt_get_tool_target_name(target_name uic) -qt_add_tool(${target_name} +qt_internal_add_tool(${target_name} TARGET_DESCRIPTION "Qt User Interface Compiler" TOOLS_TARGET Widgets # special case SOURCES -- cgit v1.2.3