Regenerate tools projects

Change-Id: I69a56ca2bd1d5f983197c6cde400c191c5dc7bd9
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Qt CMake Build Bot

src/tools/androiddeployqt/.prev_CMakeLists.txt

@@ -0,0 +1,28 @@
+# Generated from androiddeployqt.pro.
+
+#####################################################################
+## androiddeployqt Binary:
+#####################################################################
+
+add_qt_executable(androiddeployqt
+    SOURCES
+        main.cpp
+    DEFINES
+        QT_NO_CAST_FROM_ASCII
+        QT_NO_CAST_TO_ASCII
+        QT_NO_FOREACH
+    PUBLIC_LIBRARIES
+        Qt::Gui
+)
+
+#### Keys ignored in scope 1:.:.:androiddeployqt.pro:<TRUE>:
+# _LOADED = "qt_app"
+# _OPTION = "host_build"
+
+## Scopes:
+#####################################################################
+
+extend_target(androiddeployqt CONDITION windows
+    COMPILE_OPTIONS
+        -U__STRICT_ANSI__
+)

src/tools/androiddeployqt/CMakeLists.txt

@@ -11,10 +11,11 @@ add_qt_executable(androiddeployqt
         QT_NO_CAST_FROM_ASCII
         QT_NO_CAST_TO_ASCII
         QT_NO_FOREACH
+    PUBLIC_LIBRARIES
+        Qt::Core # special case
 )
 
 #### Keys ignored in scope 1:.:.:androiddeployqt.pro:<TRUE>:
-# CONFIG = "console"
 # _LOADED = "qt_app"
 # _OPTION = "host_build"
 

src/tools/qdbuscpp2xml/CMakeLists.txt

@@ -33,9 +33,16 @@ add_qt_tool(qdbuscpp2xml
     # _OPTION = "host_build"
 )
 
+#### Keys ignored in scope 1:.:.:qdbuscpp2xml.pro:<TRUE>:
+# QMAKE_TARGET_DESCRIPTION = "Qt D-Bus C++ to XML Compiler"
+# _LOADED = "qt_tool"
+# _OPTION = "host_build"
+
 ## Scopes:
 #####################################################################
 
-# special case:
+# special case begin
 # extend_target(qdbuscpp2xml CONDITION force_bootstrap [...])
 # extend_target(qdbuscpp2xml CONDITION NOT force_bootstrap [...])
+# special case end
+

src/tools/qdbusxml2cpp/.prev_CMakeLists.txt

@@ -0,0 +1,37 @@
+# Generated from qdbusxml2cpp.pro.
+
+#####################################################################
+## qdbusxml2cpp Tool:
+#####################################################################
+
+add_qt_tool(qdbusxml2cpp
+    SOURCES
+        qdbusxml2cpp.cpp
+    DEFINES
+        QT_NO_CAST_FROM_ASCII
+        QT_NO_FOREACH
+    LIBRARIES
+        Qt::CorePrivate
+)
+
+#### Keys ignored in scope 1:.:.:qdbusxml2cpp.pro:<TRUE>:
+# QMAKE_TARGET_DESCRIPTION = "Qt D-Bus XML to C++ Compiler"
+# _LOADED = "qt_tool"
+# _OPTION = "host_build"
+
+## Scopes:
+#####################################################################
+
+extend_target(qdbusxml2cpp CONDITION NOT force_bootstrap
+    LIBRARIES
+        Qt::DBusPrivate
+    PUBLIC_LIBRARIES
+        Qt::DBus
+)
+
+extend_target(qdbusxml2cpp CONDITION force_bootstrap
+    LIBRARIES
+        bootstrap_dbusPrivate
+    PUBLIC_LIBRARIES
+        bootstrap_dbus
+)

src/tools/qdbusxml2cpp/CMakeLists.txt

@@ -21,10 +21,16 @@ add_qt_tool(qdbusxml2cpp
     # _OPTION = "host_build"
 )
 
+#### Keys ignored in scope 1:.:.:qdbusxml2cpp.pro:<TRUE>:
+# QMAKE_TARGET_DESCRIPTION = "Qt D-Bus XML to C++ Compiler"
+# _LOADED = "qt_tool"
+# _OPTION = "host_build"
+
 ## Scopes:
 #####################################################################
 
-# special case:
+# 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 NOT QT_FEATURE_commandlineparser AND NOT force_bootstrap [...])
 # extend_target(qdbusxml2cpp CONDITION force_bootstrap [...])
+# special case end

src/tools/qlalr/.prev_CMakeLists.txt

@@ -0,0 +1,27 @@
+# Generated from qlalr.pro.
+
+#####################################################################
+## qlalr Tool:
+#####################################################################
+
+add_qt_tool(qlalr
+    SOURCES
+        compress.cpp compress.h
+        cppgenerator.cpp cppgenerator.h
+        dotgraph.cpp dotgraph.h
+        grammar.cpp grammar_p.h
+        lalr.cpp lalr.h
+        main.cpp
+        parsetable.cpp parsetable.h
+        recognizer.cpp recognizer.h
+    DEFINES
+        QT_NO_FOREACH
+    PUBLIC_LIBRARIES
+        Qt::Gui
+)
+
+#### Keys ignored in scope 1:.:.:qlalr.pro:<TRUE>:
+# OTHER_FILES = "lalr.g"
+# QMAKE_TARGET_DESCRIPTION = "Qt Look Ahead LR Parser Generator"
+# _LOADED = "qt_tool"
+# _OPTION = "host_build"

src/tools/qlalr/CMakeLists.txt

@@ -17,8 +17,12 @@ add_qt_tool(qlalr
         recognizer.cpp recognizer.h
     DEFINES
         QT_NO_FOREACH
-    # OTHER_FILES = "lalr.g"
-    # QMAKE_TARGET_DESCRIPTION = "Qt Look Ahead LR Parser Generator"
-    # _LOADED = "qt_tool"
-    # _OPTION = "host_build"
+    PUBLIC_LIBRARIES
+        Qt::Core # special case
 )
+
+#### Keys ignored in scope 1:.:.:qlalr.pro:<TRUE>:
+# OTHER_FILES = "lalr.g"
+# QMAKE_TARGET_DESCRIPTION = "Qt Look Ahead LR Parser Generator"
+# _LOADED = "qt_tool"
+# _OPTION = "host_build"

src/tools/qvkgen/.prev_CMakeLists.txt

@@ -0,0 +1,17 @@
+# Generated from qvkgen.pro.
+
+#####################################################################
+## qvkgen Tool:
+#####################################################################
+
+add_qt_tool(qvkgen
+    SOURCES
+        qvkgen.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+)
+
+#### Keys ignored in scope 1:.:.:qvkgen.pro:<TRUE>:
+# QMAKE_TARGET_DESCRIPTION = "Qt Vulkan Header Generator"
+# _LOADED = "qt_tool"
+# _OPTION = "host_build"

src/tools/qvkgen/CMakeLists.txt

@@ -8,7 +8,11 @@ add_qt_tool(qvkgen
     TOOLS_TARGET Gui # special case
     SOURCES
         qvkgen.cpp
-    # QMAKE_TARGET_DESCRIPTION = "Qt Vulkan Header Generator"
-    # _LOADED = "qt_tool"
-    # _OPTION = "host_build"
+    PUBLIC_LIBRARIES
+        Qt::Core # special case
 )
+
+#### Keys ignored in scope 1:.:.:qvkgen.pro:<TRUE>:
+# QMAKE_TARGET_DESCRIPTION = "Qt Vulkan Header Generator"
+# _LOADED = "qt_tool"
+# _OPTION = "host_build"

src/tools/rcc/.prev_CMakeLists.txt

@@ -0,0 +1,38 @@
+# Generated from rcc.pro.
+
+#####################################################################
+## rcc Tool:
+#####################################################################
+
+add_qt_tool(rcc
+    BOOTSTRAP
+    SOURCES
+        main.cpp
+        rcc.cpp rcc.h
+    DEFINES
+        QT_NO_CAST_FROM_ASCII
+        QT_NO_FOREACH
+        QT_RCC
+    INCLUDE_DIRECTORIES
+        ${CMAKE_CURRENT_SOURCE_DIR}
+)
+
+#### Keys ignored in scope 1:.:.:rcc.pro:<TRUE>:
+# QMAKE_TARGET_DESCRIPTION = "Qt Resource Compiler"
+# _LOADED = "qt_tool"
+# _OPTION = "host_build"
+
+## Scopes:
+#####################################################################
+
+extend_target(rcc CONDITION QT_FEATURE_zstd AND NOT cross_compile
+    DEFINES
+        QT_FEATURE_zstd=1
+    LIBRARIES
+        ZSTD::ZSTD
+)
+
+extend_target(rcc CONDITION cross_compile OR NOT QT_FEATURE_zstd
+    DEFINES
+        QT_FEATURE_zstd=-1
+)

src/tools/rcc/CMakeLists.txt

@@ -11,13 +11,29 @@ add_qt_tool(rcc
         main.cpp
         rcc.cpp rcc.h
     DEFINES
-        QT_RCC
         QT_NO_CAST_FROM_ASCII
         QT_NO_FOREACH
+        QT_RCC
     INCLUDE_DIRECTORIES
         ${CMAKE_CURRENT_SOURCE_DIR}
-    # CONFIG = "force_bootstrap"
-    # QMAKE_TARGET_DESCRIPTION = "Qt Resource Compiler"
-    # _LOADED = "qt_tool"
-    # _OPTION = "host_build"
+)
+
+#### Keys ignored in scope 1:.:.:rcc.pro:<TRUE>:
+# QMAKE_TARGET_DESCRIPTION = "Qt Resource Compiler"
+# _LOADED = "qt_tool"
+# _OPTION = "host_build"
+
+## Scopes:
+#####################################################################
+
+extend_target(rcc CONDITION QT_FEATURE_zstd AND NOT cross_compile
+    DEFINES
+        QT_FEATURE_zstd=1
+    LIBRARIES
+        ZSTD::ZSTD
+)
+
+extend_target(rcc CONDITION cross_compile OR NOT QT_FEATURE_zstd
+    DEFINES
+        QT_FEATURE_zstd=-1
 )

src/tools/tracegen/.prev_CMakeLists.txt

@@ -0,0 +1,21 @@
+# Generated from tracegen.pro.
+
+#####################################################################
+## tracegen Tool:
+#####################################################################
+
+add_qt_tool(tracegen
+    BOOTSTRAP
+    SOURCES
+        etw.cpp etw.h
+        helpers.cpp helpers.h
+        lttng.cpp lttng.h
+        panic.cpp panic.h
+        provider.cpp provider.h
+        qtheaders.cpp qtheaders.h
+        tracegen.cpp
+)
+
+#### Keys ignored in scope 1:.:.:tracegen.pro:<TRUE>:
+# _LOADED = "qt_tool"
+# _OPTION = "host_build"

src/tools/uic/.prev_CMakeLists.txt

@@ -0,0 +1,45 @@
+# Generated from uic.pro.
+
+#####################################################################
+## uic Tool:
+#####################################################################
+
+add_qt_tool(uic
+    SOURCES
+        cpp/cppwritedeclaration.cpp cpp/cppwritedeclaration.h
+        cpp/cppwriteincludes.cpp cpp/cppwriteincludes.h
+        cpp/cppwriteinitialization.cpp cpp/cppwriteinitialization.h
+        customwidgetsinfo.cpp customwidgetsinfo.h
+        databaseinfo.cpp databaseinfo.h
+        driver.cpp driver.h
+        main.cpp
+        option.h
+        python/pythonwritedeclaration.cpp python/pythonwritedeclaration.h
+        python/pythonwriteimports.cpp python/pythonwriteimports.h
+        shared/language.cpp shared/language.h
+        treewalker.cpp treewalker.h
+        ui4.cpp ui4.h
+        uic.cpp uic.h
+        utils.h
+        validator.cpp validator.h
+    DEFINES
+        QT_NO_CAST_FROM_ASCII
+        QT_NO_FOREACH
+        QT_UIC
+    INCLUDE_DIRECTORIES
+        ${CMAKE_CURRENT_SOURCE_DIR}
+        ${PROJECT_BINARY_DIR}/src/tools/uic
+        cpp
+        python
+        shared
+    PUBLIC_LIBRARIES
+        Qt::Gui
+)
+
+#### Keys ignored in scope 1:.:.:uic.pro:<TRUE>:
+# QMAKE_TARGET_DESCRIPTION = "Qt User Interface Compiler"
+# _LOADED = "qt_tool"
+# _OPTION = "host_build"
+
+## Scopes:
+#####################################################################

src/tools/uic/CMakeLists.txt

@@ -24,16 +24,17 @@ add_qt_tool(uic
         utils.h
         validator.cpp validator.h
     DEFINES
-        QT_UIC
         QT_NO_CAST_FROM_ASCII
         QT_NO_FOREACH
-        QT_UIC_CPP_GENERATOR # special case
+        QT_UIC
     INCLUDE_DIRECTORIES
-        # . # special case: remove
-        shared
+        ${CMAKE_CURRENT_SOURCE_DIR}
+        # ${PROJECT_BINARY_DIR}/src/tools/uic # special case remove
         cpp
-        # ${CMAKE_CURRENT_BINARY_DIR} # special case: remove
         python
+        shared
+    #PUBLIC_LIBRARIES # special case remove
+        #Qt::Gui # special case remove
 )
 
 #### Keys ignored in scope 1:.:.:uic.pro:<TRUE>:
@@ -43,6 +44,3 @@ add_qt_tool(uic
 
 ## Scopes:
 #####################################################################
-
-#### Keys ignored in scope 2:.:.:uic.pro:NOT force_bootstrap AND NOT qtConfig(commandlineparser OR NOT QT_FEATURE_textcodec OR NOT QT_FEATURE_xmlstreamreader OR NOT QT_FEATURE_xmlstreamwriter:
-# CONFIG = "force_bootstrap"