Port the rest of QtTools

Change-Id: I4115bde9af38219682d0e6707bc7aa8fcb8d6bb0
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>

29 files changed, 918 insertions, 31 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 764696b1f..3fa152d71 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -12,7 +12,7 @@ project(QtTools # special case
 # special case begin
 set(QT_REPO_NOT_WARNINGS_CLEAN TRUE)
 find_package(Qt6 ${PROJECT_VERSION} CONFIG REQUIRED COMPONENTS BuildInternals Core Network)
-find_package(Qt6 ${PROJECT_VERSION} CONFIG OPTIONAL_COMPONENTS Xml Widgets Quick QuickWidgets)
+find_package(Qt6 ${PROJECT_VERSION} CONFIG OPTIONAL_COMPONENTS Xml Widgets Quick QuickWidgets QmlDevTools Sql PrintSupport)
 # special case end
 
 qt_build_repo()
diff --git a/src/.prev_CMakeLists.txt b/src/.prev_CMakeLists.txt
index 4d3724430..08ee6c482 100644
--- a/src/.prev_CMakeLists.txt
+++ b/src/.prev_CMakeLists.txt
@@ -2,6 +2,7 @@
 
 add_subdirectory(linguist)
 add_subdirectory(qtattributionsscanner)
+add_subdirectory(global)
 if(QT_FEATURE_png AND QT_FEATURE_pushbutton AND QT_FEATURE_toolbutton AND TARGET Qt::Widgets)
     add_subdirectory(assistant)
     add_subdirectory(designer)
@@ -13,7 +14,7 @@ endif()
 if(QT_FEATURE_library AND (android_app OR NOT ANDROID))
     add_subdirectory(qtplugininfo)
 endif()
-if(QT_FEATURE_qdoc AND QT_FEATURE_thread)
+if(QT_FEATURE_clang AND QT_FEATURE_thread)
     add_subdirectory(qdoc)
 endif()
 if(android_app OR NOT ANDROID)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 156f055fb..a06b7e17c 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -4,16 +4,16 @@ add_subdirectory(global)
 add_subdirectory(linguist)
 add_subdirectory(qtattributionsscanner)
 if(QT_FEATURE_png AND QT_FEATURE_pushbutton AND QT_FEATURE_toolbutton AND TARGET Qt::Widgets)
-    #add_subdirectory(assistant)
+    add_subdirectory(assistant)
     add_subdirectory(designer)
-    #add_subdirectory(pixeltool)
-endif()
-#if(QT_FEATURE_png AND QT_FEATURE_thread AND QT_FEATURE_toolbutton AND TARGET Qt::Quick AND TARGET Qt::Widgets)
-    #add_subdirectory(distancefieldgenerator)
-#endif()
-#if(QT_FEATURE_library AND (android_app OR NOT ANDROID))
-    #add_subdirectory(qtplugininfo)
-#endif()
+    add_subdirectory(pixeltool)
+endif()
+if(QT_FEATURE_png AND QT_FEATURE_thread AND QT_FEATURE_toolbutton AND TARGET Qt::Quick AND TARGET Qt::Widgets)
+    add_subdirectory(distancefieldgenerator)
+endif()
+if(QT_FEATURE_library AND (android_app OR NOT ANDROID))
+    add_subdirectory(qtplugininfo)
+endif()
 # special case begin
 qt_feature_module_begin(
     NO_MODULE
@@ -27,21 +27,21 @@ qt_feature_module_end(NO_MODULE)
 if(QT_FEATURE_qdoc AND QT_FEATURE_thread)
     add_subdirectory(qdoc)
 endif()
-#if(android_app OR NOT ANDROID)
-    #add_subdirectory(qtpaths)
-#endif()
-#if(APPLE_OSX)
-    #add_subdirectory(macdeployqt)
-#endif()
-#if(TARGET Qt::DBus)
-    #add_subdirectory(qdbus)
-#endif()
-#if(WIN32)
-    #add_subdirectory(windeployqt)
-#endif()
-#if(WINRT)
-    #add_subdirectory(winrtrunner)
-#endif()
-#if(TARGET Qt::Gui AND NOT ANDROID AND NOT APPLE_UIKIT AND NOT QNX AND NOT WASM AND NOT WINRT)
-    #add_subdirectory(qtdiag)
-#endif()
+if(android_app OR NOT ANDROID)
+    add_subdirectory(qtpaths)
+endif()
+if(APPLE_OSX)
+    add_subdirectory(macdeployqt)
+endif()
+if(TARGET Qt::DBus)
+    add_subdirectory(qdbus)
+endif()
+if(WIN32)
+    add_subdirectory(windeployqt)
+endif()
+if(WINRT)
+    add_subdirectory(winrtrunner)
+endif()
+if(TARGET Qt::Gui AND NOT ANDROID AND NOT APPLE_UIKIT AND NOT QNX AND NOT WASM AND NOT WINRT)
+    add_subdirectory(qtdiag)
+endif()
diff --git a/src/assistant/CMakeLists.txt b/src/assistant/CMakeLists.txt
new file mode 100644
index 000000000..6b276bdc5
--- /dev/null
+++ b/src/assistant/CMakeLists.txt
@@ -0,0 +1,9 @@
+# Generated from assistant.pro.
+
+if(NOT TARGET Qt::Sql OR NOT TARGET Qt::PrintSupport) # special case
+    return()
+endif()
+add_subdirectory(help)
+add_subdirectory(assistant)
+add_subdirectory(qhelpgenerator)
+add_subdirectory(qcollectiongenerator)
diff --git a/src/assistant/assistant/.prev_CMakeLists.txt b/src/assistant/assistant/.prev_CMakeLists.txt
new file mode 100644
index 000000000..3c3d5849c
--- /dev/null
+++ b/src/assistant/assistant/.prev_CMakeLists.txt
@@ -0,0 +1,166 @@
+# Generated from assistant.pro.
+
+#####################################################################
+## assistant Binary:
+#####################################################################
+
+qt_add_executable(assistant
+    GUI
+    SOURCES
+        ../../shared/fontpanel/fontpanel.cpp ../../shared/fontpanel/fontpanel.h
+        ../shared/collectionconfiguration.cpp ../shared/collectionconfiguration.h
+        aboutdialog.cpp aboutdialog.h
+        bookmarkdialog.cpp bookmarkdialog.h bookmarkdialog.ui
+        bookmarkfiltermodel.cpp bookmarkfiltermodel.h
+        bookmarkitem.cpp bookmarkitem.h
+        bookmarkmanager.cpp bookmarkmanager.h
+        bookmarkmanagerwidget.cpp bookmarkmanagerwidget.h bookmarkmanagerwidget.ui
+        bookmarkmodel.cpp bookmarkmodel.h
+        bookmarkwidget.ui
+        centralwidget.cpp centralwidget.h
+        cmdlineparser.cpp cmdlineparser.h
+        contentwindow.cpp contentwindow.h
+        filternamedialog.cpp filternamedialog.h filternamedialog.ui
+        findwidget.cpp findwidget.h
+        globalactions.cpp globalactions.h
+        helpbrowsersupport.cpp helpbrowsersupport.h
+        helpenginewrapper.cpp helpenginewrapper.h
+        helpviewer.cpp helpviewer.h helpviewer_p.h
+        indexwindow.cpp indexwindow.h
+        main.cpp
+        mainwindow.cpp mainwindow.h
+        openpagesmanager.cpp openpagesmanager.h
+        openpagesmodel.cpp openpagesmodel.h
+        openpagesswitcher.cpp openpagesswitcher.h
+        openpageswidget.cpp openpageswidget.h
+        optionswidget.cpp optionswidget.h
+        preferencesdialog.cpp preferencesdialog.h preferencesdialog.ui
+        qtdocinstaller.cpp qtdocinstaller.h
+        remotecontrol.cpp remotecontrol.h
+        searchwidget.cpp searchwidget.h
+        topicchooser.cpp topicchooser.h topicchooser.ui
+        tracer.h
+        xbelsupport.cpp xbelsupport.h
+    INCLUDE_DIRECTORIES
+        ../../shared/fontpanel
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Help
+        Qt::Network
+        Qt::Sql
+        Qt::Widgets
+    ENABLE_AUTOGEN_TOOLS
+        uic
+)
+
+# Resources:
+set(assistant_resource_files
+    "assistant.qch"
+)
+
+qt_add_resource(assistant "assistant"
+    PREFIX
+        "/qt-project.org/assistant"
+    FILES
+        ${assistant_resource_files}
+)
+set(assistant_images_resource_files
+    "images/assistant-128.png"
+    "images/assistant.png"
+    "images/bookmark.png"
+    "images/closebutton.png"
+    "images/darkclosebutton.png"
+    "images/mac/addtab.png"
+    "images/mac/book.png"
+    "images/mac/closetab.png"
+    "images/mac/editcopy.png"
+    "images/mac/find.png"
+    "images/mac/home.png"
+    "images/mac/minus.png"
+    "images/mac/next.png"
+    "images/mac/plus.png"
+    "images/mac/previous.png"
+    "images/mac/print.png"
+    "images/mac/resetzoom.png"
+    "images/mac/synctoc.png"
+    "images/mac/zoomin.png"
+    "images/mac/zoomout.png"
+    "images/win/addtab.png"
+    "images/win/book.png"
+    "images/win/closetab.png"
+    "images/win/editcopy.png"
+    "images/win/find.png"
+    "images/win/home.png"
+    "images/win/minus.png"
+    "images/win/next.png"
+    "images/win/plus.png"
+    "images/win/previous.png"
+    "images/win/print.png"
+    "images/win/resetzoom.png"
+    "images/win/synctoc.png"
+    "images/win/zoomin.png"
+    "images/win/zoomout.png"
+    "images/wrap.png"
+)
+
+qt_add_resource(assistant "assistant_images"
+    PREFIX
+        "/qt-project.org/assistant"
+    FILES
+        ${assistant_images_resource_files}
+)
+
+
+#### Keys ignored in scope 1:.:.:assistant.pro:<TRUE>:
+# PROJECTNAME = "Assistant"
+# QMAKE_TARGET_DESCRIPTION = "Qt" "Assistant"
+
+## Scopes:
+#####################################################################
+
+#### Keys ignored in scope 2:.:.:assistant.pro:TARGET Qt::WebKitWidgets AND NOT QT_CONFIG___contains___static:
+# BROWSER = "qtwebkit"
+
+#### Keys ignored in scope 3:.:.:assistant.pro:else:
+# BROWSER = "qtextbrowser"
+
+qt_extend_target(assistant CONDITION TARGET Qt::PrintSupport
+    PUBLIC_LIBRARIES
+        Qt::PrintSupport
+)
+
+qt_extend_target(assistant CONDITION BROWSER___equals___qtwebkit
+    SOURCES
+        helpviewer_qwv.cpp
+    DEFINES
+        BROWSER_QTWEBKIT
+    PUBLIC_LIBRARIES
+        Qt::WebKitWidgets
+)
+
+qt_extend_target(assistant CONDITION NOT BROWSER___equals___qtwebkit
+    SOURCES
+        helpviewer_qtb.cpp
+    DEFINES
+        BROWSER_QTEXTBROWSER
+)
+
+qt_extend_target(assistant CONDITION WIN32
+    SOURCES
+        stdinlistener_win.cpp stdinlistener_win.h
+    PUBLIC_LIBRARIES
+        shell32
+)
+
+qt_extend_target(assistant CONDITION UNIX
+    SOURCES
+        stdinlistener.cpp stdinlistener.h
+)
+
+#### Keys ignored in scope 11:.:.:assistant.pro:APPLE:
+# ICON = "assistant.icns"
+# QMAKE_INFO_PLIST = "Info_mac.plist"
+qt_add_docs(assistant
+    doc/qtassistant.qdocconf
+)
+
diff --git a/src/assistant/assistant/CMakeLists.txt b/src/assistant/assistant/CMakeLists.txt
new file mode 100644
index 000000000..a2ded6fdc
--- /dev/null
+++ b/src/assistant/assistant/CMakeLists.txt
@@ -0,0 +1,167 @@
+# Generated from assistant.pro.
+
+#####################################################################
+## assistant Binary:
+#####################################################################
+
+qt_add_executable(assistant
+    GUI
+    SOURCES
+        ../../shared/fontpanel/fontpanel.cpp ../../shared/fontpanel/fontpanel.h
+        ../shared/collectionconfiguration.cpp ../shared/collectionconfiguration.h
+        aboutdialog.cpp aboutdialog.h
+        bookmarkdialog.cpp bookmarkdialog.h bookmarkdialog.ui
+        bookmarkfiltermodel.cpp bookmarkfiltermodel.h
+        bookmarkitem.cpp bookmarkitem.h
+        bookmarkmanager.cpp bookmarkmanager.h
+        bookmarkmanagerwidget.cpp bookmarkmanagerwidget.h bookmarkmanagerwidget.ui
+        bookmarkmodel.cpp bookmarkmodel.h
+        bookmarkwidget.ui
+        centralwidget.cpp centralwidget.h
+        cmdlineparser.cpp cmdlineparser.h
+        contentwindow.cpp contentwindow.h
+        filternamedialog.cpp filternamedialog.h filternamedialog.ui
+        findwidget.cpp findwidget.h
+        globalactions.cpp globalactions.h
+        helpbrowsersupport.cpp helpbrowsersupport.h
+        helpenginewrapper.cpp helpenginewrapper.h
+        helpviewer.cpp helpviewer.h helpviewer_p.h
+        indexwindow.cpp indexwindow.h
+        main.cpp
+        mainwindow.cpp mainwindow.h
+        openpagesmanager.cpp openpagesmanager.h
+        openpagesmodel.cpp openpagesmodel.h
+        openpagesswitcher.cpp openpagesswitcher.h
+        openpageswidget.cpp openpageswidget.h
+        optionswidget.cpp optionswidget.h
+        preferencesdialog.cpp preferencesdialog.h preferencesdialog.ui
+        qtdocinstaller.cpp qtdocinstaller.h
+        remotecontrol.cpp remotecontrol.h
+        searchwidget.cpp searchwidget.h
+        topicchooser.cpp topicchooser.h topicchooser.ui
+        tracer.h
+        xbelsupport.cpp xbelsupport.h
+    INCLUDE_DIRECTORIES
+        ../../shared/fontpanel
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Help
+        Qt::Network
+        Qt::Sql
+        Qt::Widgets
+        Qt::PrintSupport # special case
+    ENABLE_AUTOGEN_TOOLS
+        uic
+)
+
+# Resources:
+set(assistant_resource_files
+    "assistant.qch"
+)
+
+qt_add_resource(assistant "assistant"
+    PREFIX
+        "/qt-project.org/assistant"
+    FILES
+        ${assistant_resource_files}
+)
+set(assistant_images_resource_files
+    "images/assistant-128.png"
+    "images/assistant.png"
+    "images/bookmark.png"
+    "images/closebutton.png"
+    "images/darkclosebutton.png"
+    "images/mac/addtab.png"
+    "images/mac/book.png"
+    "images/mac/closetab.png"
+    "images/mac/editcopy.png"
+    "images/mac/find.png"
+    "images/mac/home.png"
+    "images/mac/minus.png"
+    "images/mac/next.png"
+    "images/mac/plus.png"
+    "images/mac/previous.png"
+    "images/mac/print.png"
+    "images/mac/resetzoom.png"
+    "images/mac/synctoc.png"
+    "images/mac/zoomin.png"
+    "images/mac/zoomout.png"
+    "images/win/addtab.png"
+    "images/win/book.png"
+    "images/win/closetab.png"
+    "images/win/editcopy.png"
+    "images/win/find.png"
+    "images/win/home.png"
+    "images/win/minus.png"
+    "images/win/next.png"
+    "images/win/plus.png"
+    "images/win/previous.png"
+    "images/win/print.png"
+    "images/win/resetzoom.png"
+    "images/win/synctoc.png"
+    "images/win/zoomin.png"
+    "images/win/zoomout.png"
+    "images/wrap.png"
+)
+
+qt_add_resource(assistant "assistant_images"
+    PREFIX
+        "/qt-project.org/assistant"
+    FILES
+        ${assistant_images_resource_files}
+)
+
+
+#### Keys ignored in scope 1:.:.:assistant.pro:<TRUE>:
+# PROJECTNAME = "Assistant"
+# QMAKE_TARGET_DESCRIPTION = "Qt" "Assistant"
+
+## Scopes:
+#####################################################################
+
+#### Keys ignored in scope 2:.:.:assistant.pro:TARGET Qt::WebKitWidgets AND NOT QT_CONFIG___contains___static:
+# BROWSER = "qtwebkit"
+
+#### Keys ignored in scope 3:.:.:assistant.pro:else:
+# BROWSER = "qtextbrowser"
+
+qt_extend_target(assistant CONDITION TARGET Qt::PrintSupport
+    PUBLIC_LIBRARIES
+        Qt::PrintSupport
+)
+
+qt_extend_target(assistant CONDITION BROWSER___equals___qtwebkit
+    SOURCES
+        helpviewer_qwv.cpp
+    DEFINES
+        BROWSER_QTWEBKIT
+    PUBLIC_LIBRARIES
+        Qt::WebKitWidgets
+)
+
+qt_extend_target(assistant CONDITION NOT BROWSER___equals___qtwebkit
+    SOURCES
+        helpviewer_qtb.cpp
+    DEFINES
+        BROWSER_QTEXTBROWSER
+)
+
+qt_extend_target(assistant CONDITION WIN32
+    SOURCES
+        stdinlistener_win.cpp stdinlistener_win.h
+    PUBLIC_LIBRARIES
+        shell32
+)
+
+qt_extend_target(assistant CONDITION UNIX
+    SOURCES
+        stdinlistener.cpp stdinlistener.h
+)
+
+#### Keys ignored in scope 11:.:.:assistant.pro:APPLE:
+# ICON = "assistant.icns"
+# QMAKE_INFO_PLIST = "Info_mac.plist"
+qt_add_docs(assistant
+    doc/qtassistant.qdocconf
+)
+
diff --git a/src/assistant/help/CMakeLists.txt b/src/assistant/help/CMakeLists.txt
new file mode 100644
index 000000000..eb2589a5d
--- /dev/null
+++ b/src/assistant/help/CMakeLists.txt
@@ -0,0 +1,56 @@
+# Generated from help.pro.
+
+#####################################################################
+## Help Module:
+#####################################################################
+
+qt_add_module(Help
+    SOURCES
+        qcompressedhelpinfo.cpp qcompressedhelpinfo.h
+        qhelp_global.cpp qhelp_global.h
+        qhelpcollectionhandler.cpp qhelpcollectionhandler_p.h
+        qhelpcontentwidget.cpp qhelpcontentwidget.h
+        qhelpdbreader.cpp qhelpdbreader_p.h
+        qhelpengine.cpp qhelpengine.h qhelpengine_p.h
+        qhelpenginecore.cpp qhelpenginecore.h
+        qhelpfilterdata.cpp qhelpfilterdata.h
+        qhelpfilterengine.cpp qhelpfilterengine.h
+        qhelpindexwidget.cpp qhelpindexwidget.h
+        qhelpsearchengine.cpp qhelpsearchengine.h
+        qhelpsearchindexreader.cpp qhelpsearchindexreader_p.h
+        qhelpsearchindexreader_default.cpp qhelpsearchindexreader_default_p.h
+        qhelpsearchindexwriter_default.cpp qhelpsearchindexwriter_default_p.h
+        qhelpsearchquerywidget.cpp qhelpsearchquerywidget.h
+        qhelpsearchresultwidget.cpp qhelpsearchresultwidget.h
+    DEFINES
+        # -QT_ASCII_CAST_WARNINGS # special case remove
+        QHELP_LIB
+    LIBRARIES
+        Qt::CorePrivate
+        Qt::Network
+    PUBLIC_LIBRARIES
+        Qt::Core
+        Qt::Gui
+        Qt::Sql
+        Qt::Widgets
+)
+
+# Resources:
+set(helpsystem_resource_files
+    "images/1leftarrow.png"
+    "images/1rightarrow.png"
+    "images/3leftarrow.png"
+    "images/3rightarrow.png"
+)
+
+qt_add_resource(Help "helpsystem"
+    PREFIX
+        "/qt-project.org/assistant"
+    FILES
+        ${helpsystem_resource_files}
+)
+
+qt_add_docs(Help
+    doc/qthelp.qdocconf
+)
+
diff --git a/src/assistant/qcollectiongenerator/CMakeLists.txt b/src/assistant/qcollectiongenerator/CMakeLists.txt
new file mode 100644
index 000000000..ba927bd78
--- /dev/null
+++ b/src/assistant/qcollectiongenerator/CMakeLists.txt
@@ -0,0 +1,15 @@
+# Generated from qcollectiongenerator.pro.
+
+#####################################################################
+## qcollectiongenerator Tool:
+#####################################################################
+
+qt_add_tool(qcollectiongenerator
+    SOURCES
+        main.c
+    PUBLIC_LIBRARIES
+        Qt::Gui
+)
+
+#### Keys ignored in scope 1:.:.:qcollectiongenerator.pro:<TRUE>:
+# QMAKE_TARGET_DESCRIPTION = "Qt Help Collection File Generator"
diff --git a/src/assistant/qhelpgenerator/CMakeLists.txt b/src/assistant/qhelpgenerator/CMakeLists.txt
new file mode 100644
index 000000000..564edd5eb
--- /dev/null
+++ b/src/assistant/qhelpgenerator/CMakeLists.txt
@@ -0,0 +1,25 @@
+# Generated from qhelpgenerator.pro.
+
+#####################################################################
+## qhelpgenerator Tool:
+#####################################################################
+
+qt_add_tool(qhelpgenerator
+    SOURCES
+        ../shared/collectionconfiguration.cpp ../shared/collectionconfiguration.h
+        collectionconfigreader.cpp collectionconfigreader.h
+        helpgenerator.cpp helpgenerator.h
+        main.cpp
+        qhelpdatainterface.cpp qhelpdatainterface_p.h
+        qhelpprojectdata.cpp qhelpprojectdata_p.h
+    LIBRARIES
+        Qt::HelpPrivate
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Help
+        Qt::Network
+)
+
+#### Keys ignored in scope 1:.:.:qhelpgenerator.pro:<TRUE>:
+# QMAKE_TARGET_DESCRIPTION = "Qt Compressed Help File Generator"
+# QTPLUGIN.platforms = "qminimal"
diff --git a/src/designer/src/plugins/CMakeLists.txt b/src/designer/src/plugins/CMakeLists.txt
index 50295d363..9534009be 100644
--- a/src/designer/src/plugins/CMakeLists.txt
+++ b/src/designer/src/plugins/CMakeLists.txt
@@ -1,9 +1,9 @@
 # Generated from plugins.pro.
 
-if(TARGET webkitwidgets)
+if(TARGET Qt::WebKitWidgets)
     add_subdirectory(qwebview)
 endif()
-if(TARGET axcontainer AND WIN32)
+if(TARGET Qt::AxContainer AND WIN32)
     add_subdirectory(activeqt)
 endif()
 if(TARGET Qt::QuickWidgets)
diff --git a/src/designer/src/plugins/activeqt/CMakeLists.txt b/src/designer/src/plugins/activeqt/CMakeLists.txt
new file mode 100644
index 000000000..dbeef1cf5
--- /dev/null
+++ b/src/designer/src/plugins/activeqt/CMakeLists.txt
@@ -0,0 +1,27 @@
+# Generated from activeqt.pro.
+
+#####################################################################
+## qaxwidget Plugin:
+#####################################################################
+
+qt_add_plugin(qaxwidget
+    TYPE designer
+    CLASS_NAME QAxWidgetPlugin
+    SOURCES
+        qaxwidgetextrainfo.cpp qaxwidgetextrainfo.h
+        qaxwidgetplugin.cpp qaxwidgetplugin.h
+        qaxwidgetpropertysheet.cpp qaxwidgetpropertysheet.h
+        qaxwidgettaskmenu.cpp qaxwidgettaskmenu.h
+        qdesigneraxwidget.cpp qdesigneraxwidget.h
+    LIBRARIES
+        Qt::DesignerPrivate
+    PUBLIC_LIBRARIES
+        Qt::AxContainer
+        Qt::Core
+        Qt::Designer
+        Qt::Gui
+        Qt::Widgets
+)
+
+#### Keys ignored in scope 1:.:.:activeqt.pro:<TRUE>:
+# OTHER_FILES = "activeqt.json"
diff --git a/src/designer/src/plugins/qwebview/CMakeLists.txt b/src/designer/src/plugins/qwebview/CMakeLists.txt
new file mode 100644
index 000000000..120c9dcf3
--- /dev/null
+++ b/src/designer/src/plugins/qwebview/CMakeLists.txt
@@ -0,0 +1,34 @@
+# Generated from qwebview.pro.
+
+#####################################################################
+## qwebview Plugin:
+#####################################################################
+
+qt_add_plugin(qwebview
+    TYPE designer
+    CLASS_NAME QWebViewPlugin
+    SOURCES
+        qwebview_plugin.cpp qwebview_plugin.h
+    PUBLIC_LIBRARIES
+        Qt::Core
+        Qt::Designer
+        Qt::Gui
+        Qt::Widgets
+        webkitwidgets
+)
+
+# Resources:
+set(qwebview_plugin_resource_files
+    "images/qwebview.png"
+)
+
+qt_add_resource(qwebview "qwebview_plugin"
+    PREFIX
+        "/qt-project.org/qwebview"
+    FILES
+        ${qwebview_plugin_resource_files}
+)
+
+
+#### Keys ignored in scope 1:.:.:qwebview.pro:<TRUE>:
+# OTHER_FILES = "qwebview.json"
diff --git a/src/designer/src/plugins/tools/view3d/CMakeLists.txt b/src/designer/src/plugins/tools/view3d/CMakeLists.txt
new file mode 100644
index 000000000..b5424190f
--- /dev/null
+++ b/src/designer/src/plugins/tools/view3d/CMakeLists.txt
@@ -0,0 +1,21 @@
+# Generated from view3d.pro.
+
+#####################################################################
+## view3d Plugin:
+#####################################################################
+
+qt_add_plugin(view3d
+    TYPE designer
+    CLASS_NAME QView3DPlugin
+    SOURCES
+        view3d.cpp view3d.h
+        view3d_global.h
+        view3d_plugin.cpp view3d_plugin.h
+        view3d_tool.cpp view3d_tool.h
+    PUBLIC_LIBRARIES
+        Qt::Core
+        Qt::Designer
+        Qt::Gui
+        Qt::OpenGL
+        Qt::Widgets
+)
diff --git a/src/distancefieldgenerator/CMakeLists.txt b/src/distancefieldgenerator/CMakeLists.txt
new file mode 100644
index 000000000..0648f8cf4
--- /dev/null
+++ b/src/distancefieldgenerator/CMakeLists.txt
@@ -0,0 +1,35 @@
+# Generated from distancefieldgenerator.pro.
+
+#####################################################################
+## qdistancefieldgenerator Binary:
+#####################################################################
+
+qt_add_executable(qdistancefieldgenerator
+    GUI
+    SOURCES
+        distancefieldmodel.cpp distancefieldmodel.h
+        distancefieldmodelworker.cpp distancefieldmodelworker.h
+        main.cpp
+        mainwindow.cpp mainwindow.h mainwindow.ui
+    DEFINES
+        QT_NO_CAST_FROM_ASCII
+        QT_NO_CAST_TO_ASCII
+        QT_NO_FOREACH
+    LIBRARIES
+        Qt::CorePrivate
+        Qt::GuiPrivate
+        Qt::QuickPrivate
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Quick
+        Qt::Widgets
+    ENABLE_AUTOGEN_TOOLS
+        uic
+)
+
+#### Keys ignored in scope 1:.:.:distancefieldgenerator.pro:<TRUE>:
+# QMAKE_TARGET_DESCRIPTION = "Qt Distance Field Generator"
+qt_add_docs(qdistancefieldgenerator
+    doc/qtdistancefieldgenerator.qdocconf
+)
+
diff --git a/src/kmap2qmap/CMakeLists.txt b/src/kmap2qmap/CMakeLists.txt
new file mode 100644
index 000000000..3ef95a124
--- /dev/null
+++ b/src/kmap2qmap/CMakeLists.txt
@@ -0,0 +1,14 @@
+# Generated from kmap2qmap.pro.
+
+#####################################################################
+## kmap2qmap Binary:
+#####################################################################
+
+qt_add_executable(kmap2qmap
+    SOURCES
+        main.cpp
+    LIBRARIES
+        Qt::InputSupportPrivate
+    PUBLIC_LIBRARIES
+        Qt::InputSupport
+)
diff --git a/src/macdeployqt/CMakeLists.txt b/src/macdeployqt/CMakeLists.txt
new file mode 100644
index 000000000..bd411be13
--- /dev/null
+++ b/src/macdeployqt/CMakeLists.txt
@@ -0,0 +1,4 @@
+# Generated from macdeployqt.pro.
+
+add_subdirectory(macdeployqt)
+add_subdirectory(macchangeqt)
diff --git a/src/macdeployqt/macchangeqt/CMakeLists.txt b/src/macdeployqt/macchangeqt/CMakeLists.txt
new file mode 100644
index 000000000..5b79e91f7
--- /dev/null
+++ b/src/macdeployqt/macchangeqt/CMakeLists.txt
@@ -0,0 +1,14 @@
+# Generated from macchangeqt.pro.
+
+#####################################################################
+## macchangeqt Binary:
+#####################################################################
+
+qt_add_executable(macchangeqt
+    GUI
+    SOURCES
+        ../shared/shared.cpp
+        main.cpp
+    PUBLIC_LIBRARIES
+        ${FWCoreFoundation}
+)
diff --git a/src/macdeployqt/macdeployqt/CMakeLists.txt b/src/macdeployqt/macdeployqt/CMakeLists.txt
new file mode 100644
index 000000000..fd03e28b8
--- /dev/null
+++ b/src/macdeployqt/macdeployqt/CMakeLists.txt
@@ -0,0 +1,14 @@
+# Generated from macdeployqt.pro.
+
+#####################################################################
+## macdeployqt Binary:
+#####################################################################
+
+qt_add_executable(macdeployqt
+    GUI
+    SOURCES
+        ../shared/shared.cpp
+        main.cpp
+    PUBLIC_LIBRARIES
+        ${FWCoreFoundation}
+)
diff --git a/src/makeqpf/CMakeLists.txt b/src/makeqpf/CMakeLists.txt
new file mode 100644
index 000000000..0e1466b48
--- /dev/null
+++ b/src/makeqpf/CMakeLists.txt
@@ -0,0 +1,36 @@
+# Generated from makeqpf.pro.
+
+#####################################################################
+## makeqpf Binary:
+#####################################################################
+
+qt_add_executable(makeqpf
+    SOURCES
+        main.cpp
+        mainwindow.cpp mainwindow.h mainwindow.ui
+        qpf2.cpp qpf2.h
+    DEFINES
+        QT_DISABLE_DEPRECATED_BEFORE=0
+        QT_NO_FREETYPE
+    LIBRARIES
+        Qt::CorePrivate
+        Qt::GuiPrivate
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Widgets
+    ENABLE_AUTOGEN_TOOLS
+        uic
+)
+
+# Resources:
+set(makeqpf_resource_files
+    "Blocks.txt"
+)
+
+qt_add_resource(makeqpf "makeqpf"
+    PREFIX
+        "/"
+    FILES
+        ${makeqpf_resource_files}
+)
+
diff --git a/src/pixeltool/CMakeLists.txt b/src/pixeltool/CMakeLists.txt
new file mode 100644
index 000000000..e6ee7f507
--- /dev/null
+++ b/src/pixeltool/CMakeLists.txt
@@ -0,0 +1,24 @@
+# Generated from pixeltool.pro.
+
+#####################################################################
+## pixeltool Binary:
+#####################################################################
+
+qt_add_executable(pixeltool
+    GUI
+    SOURCES
+        main.cpp
+        qpixeltool.cpp qpixeltool.h
+    LIBRARIES
+        Qt::CorePrivate
+        Qt::GuiPrivate
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Widgets
+)
+
+## Scopes:
+#####################################################################
+
+#### Keys ignored in scope 2:.:.:pixeltool.pro:APPLE:
+# QMAKE_INFO_PLIST = "Info_mac.plist"
diff --git a/src/qdbus/CMakeLists.txt b/src/qdbus/CMakeLists.txt
new file mode 100644
index 000000000..5f8801b92
--- /dev/null
+++ b/src/qdbus/CMakeLists.txt
@@ -0,0 +1,8 @@
+# Generated from qdbus.pro.
+
+if(QT_FEATURE_dom)
+    add_subdirectory(qdbus)
+endif()
+if(QT_FEATURE_dialogbuttonbox AND QT_FEATURE_inputdialog AND QT_FEATURE_menu AND QT_FEATURE_messagebox AND TARGET Qt::Widgets)
+    add_subdirectory(qdbusviewer)
+endif()
diff --git a/src/qdbus/qdbus/CMakeLists.txt b/src/qdbus/qdbus/CMakeLists.txt
new file mode 100644
index 000000000..7c1bab3ed
--- /dev/null
+++ b/src/qdbus/qdbus/CMakeLists.txt
@@ -0,0 +1,19 @@
+# Generated from qdbus.pro.
+
+#####################################################################
+## qdbus Binary:
+#####################################################################
+
+qt_add_executable(qdbus
+    GUI
+    SOURCES
+        qdbus.cpp
+    LIBRARIES
+        Qt::DBusPrivate
+    PUBLIC_LIBRARIES
+        Qt::DBus
+        Qt::Xml
+)
+
+## Scopes:
+#####################################################################
diff --git a/src/qdbus/qdbusviewer/CMakeLists.txt b/src/qdbus/qdbusviewer/CMakeLists.txt
new file mode 100644
index 000000000..101107c08
--- /dev/null
+++ b/src/qdbus/qdbusviewer/CMakeLists.txt
@@ -0,0 +1,48 @@
+# Generated from qdbusviewer.pro.
+
+#####################################################################
+## qdbusviewer Binary:
+#####################################################################
+
+qt_add_executable(qdbusviewer
+    GUI
+    SOURCES
+        logviewer.cpp logviewer.h
+        main.cpp
+        mainwindow.cpp mainwindow.h
+        propertydialog.cpp propertydialog.h
+        qdbusmodel.cpp qdbusmodel.h
+        qdbusviewer.cpp qdbusviewer.h
+        servicesproxymodel.cpp servicesproxymodel.h
+    LIBRARIES
+        Qt::DBusPrivate
+    PUBLIC_LIBRARIES
+        Qt::DBus
+        Qt::Gui
+        Qt::Widgets
+        Qt::Xml
+)
+
+# Resources:
+set(qdbusviewer_resource_files
+    "images/qdbusviewer-128.png"
+    "images/qdbusviewer.png"
+)
+
+qt_add_resource(qdbusviewer "qdbusviewer"
+    PREFIX
+        "/qt-project.org/qdbusviewer"
+    FILES
+        ${qdbusviewer_resource_files}
+)
+
+
+## Scopes:
+#####################################################################
+
+#### Keys ignored in scope 2:.:.:qdbusviewer.pro:APPLE:
+# ICON = "images/qdbusviewer.icns"
+# QMAKE_INFO_PLIST = "Info_mac.plist"
+
+#### Keys ignored in scope 3:.:.:qdbusviewer.pro:WIN32:
+# RC_FILE = "qdbusviewer.rc"
diff --git a/src/qev/CMakeLists.txt b/src/qev/CMakeLists.txt
new file mode 100644
index 000000000..8d8b6baa7
--- /dev/null
+++ b/src/qev/CMakeLists.txt
@@ -0,0 +1,14 @@
+# Generated from qev.pro.
+
+#####################################################################
+## qev Binary:
+#####################################################################
+
+qt_add_executable(qev
+    GUI
+    SOURCES
+        qev.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Widgets
+)
diff --git a/src/qtdiag/CMakeLists.txt b/src/qtdiag/CMakeLists.txt
new file mode 100644
index 000000000..713d32091
--- /dev/null
+++ b/src/qtdiag/CMakeLists.txt
@@ -0,0 +1,31 @@
+# Generated from qtdiag.pro.
+
+#####################################################################
+## qtdiag Binary:
+#####################################################################
+
+qt_add_executable(qtdiag
+    SOURCES
+        main.cpp
+        qtdiag.cpp qtdiag.h
+    LIBRARIES
+        Qt::CorePrivate
+        Qt::GuiPrivate
+    PUBLIC_LIBRARIES
+        Qt::Gui
+)
+
+## Scopes:
+#####################################################################
+
+qt_extend_target(qtdiag CONDITION TARGET Qt::Widgets
+    PUBLIC_LIBRARIES
+        Qt::Widgets
+)
+
+qt_extend_target(qtdiag CONDITION TARGET Qt::Network
+    DEFINES
+        NETWORK_DIAG
+    PUBLIC_LIBRARIES
+        Qt::Network
+)
diff --git a/src/qtpaths/CMakeLists.txt b/src/qtpaths/CMakeLists.txt
new file mode 100644
index 000000000..daba98b9a
--- /dev/null
+++ b/src/qtpaths/CMakeLists.txt
@@ -0,0 +1,14 @@
+# Generated from qtpaths.pro.
+
+#####################################################################
+## qtpaths Binary:
+#####################################################################
+
+qt_add_executable(qtpaths
+    GUI
+    SOURCES
+        qtpaths.cpp
+)
+
+## Scopes:
+#####################################################################
diff --git a/src/qtplugininfo/CMakeLists.txt b/src/qtplugininfo/CMakeLists.txt
new file mode 100644
index 000000000..2c6e527ed
--- /dev/null
+++ b/src/qtplugininfo/CMakeLists.txt
@@ -0,0 +1,10 @@
+# Generated from qtplugininfo.pro.
+
+#####################################################################
+## qtplugininfo Binary:
+#####################################################################
+
+qt_add_executable(qtplugininfo
+    SOURCES
+        qtplugininfo.cpp
+)
diff --git a/src/windeployqt/CMakeLists.txt b/src/windeployqt/CMakeLists.txt
new file mode 100644
index 000000000..ad531bd9a
--- /dev/null
+++ b/src/windeployqt/CMakeLists.txt
@@ -0,0 +1,40 @@
+# Generated from windeployqt.pro.
+
+#####################################################################
+## windeployqt Tool:
+#####################################################################
+
+qt_add_tool(windeployqt
+    #BOOTSTRAP # special case
+    SOURCES
+        ../shared/winutils/elfreader.cpp ../shared/winutils/elfreader.h
+        ../shared/winutils/qmlutils.cpp ../shared/winutils/qmlutils.h
+        ../shared/winutils/utils.cpp ../shared/winutils/utils.h
+        main.cpp
+    DEFINES
+        QT_NO_CAST_FROM_ASCII
+        QT_NO_CAST_TO_ASCII
+        QT_NO_FOREACH
+    INCLUDE_DIRECTORIES
+        ../shared/winutils
+    LIBRARIES
+        Qt::CorePrivate
+        Qt::Core # special case
+)
+
+#### Keys ignored in scope 1:.:.:windeployqt.pro:<TRUE>:
+# QMAKE_TARGET_DESCRIPTION = "Qt Windows Deployment Tool"
+# _OPTION = "host_build"
+
+## Scopes:
+#####################################################################
+
+qt_extend_target(windeployqt CONDITION WIN32
+    PUBLIC_LIBRARIES
+        shlwapi
+)
+
+qt_extend_target(windeployqt CONDITION QT_FEATURE_relocatable
+    DEFINES
+        QT_RELOCATABLE
+)
diff --git a/src/winrtrunner/CMakeLists.txt b/src/winrtrunner/CMakeLists.txt
new file mode 100644
index 000000000..736e4bba6
--- /dev/null
+++ b/src/winrtrunner/CMakeLists.txt
@@ -0,0 +1,41 @@
+# Generated from winrtrunner.pro.
+
+#####################################################################
+## winrtrunner Tool:
+#####################################################################
+
+qt_add_tool(winrtrunner
+    BOOTSTRAP
+    SOURCES
+        ../shared/corecon/ccapi.h
+        ../shared/corecon/ccapi_11.h
+        ../shared/corecon/ccapi_12.h
+        ../shared/corecon/corecon.cpp ../shared/corecon/corecon.h
+        ../shared/winutils/elfreader.cpp ../shared/winutils/elfreader.h
+        ../shared/winutils/qmlutils.cpp ../shared/winutils/qmlutils.h
+        ../shared/winutils/utils.cpp ../shared/winutils/utils.h
+        appxengine.cpp appxengine.h appxengine_p.h
+        appxlocalengine.cpp appxlocalengine.h
+        appxphoneengine.cpp appxphoneengine.h
+        main.cpp
+        runner.cpp runner.h
+        runnerengine.h
+    DEFINES
+        QT_NO_CAST_FROM_ASCII
+        QT_NO_CAST_TO_ASCII
+        WINRT_LIBRARY
+    INCLUDE_DIRECTORIES
+        ../shared/corecon
+        ../shared/winutils
+    PUBLIC_LIBRARIES
+        Shlwapi
+        crypt32
+        runtimeobject
+        urlmon
+        wsclient
+        xmllite
+)
+
+#### Keys ignored in scope 1:.:.:winrtrunner.pro:<TRUE>:
+# QMAKE_TARGET_DESCRIPTION = "Qt WinRT Runner"
+# _OPTION = "host_build"