CMake: Regenerate src/gui

Remove the manual modifications, and let the script do its work
and use the .pro file as the source of truth.

Change-Id: I510d5487a326d72a9c19e8148ec1daac9a23394b
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>

1 files changed, 43 insertions, 67 deletions

diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
index febabb7d4c..61b961f568 100644
--- a/src/gui/CMakeLists.txt
+++ b/src/gui/CMakeLists.txt
@@ -280,7 +280,6 @@ qt_add_module(Gui
 )
 
 # Resources:
-
 set_source_files_properties("painting/../../3rdparty/icc/sRGB2014.icc"
     PROPERTIES QT_RESOURCE_ALIAS "sRGB2014.icc"
 )
@@ -321,8 +320,6 @@ qt_extend_target(Gui CONDITION QT_FEATURE_standarditemmodel
 
 
 #### Keys ignored in scope 1:.:.:gui.pro:<TRUE>:
-# MODULE_PLUGIN_TYPES = "platforms" "platforms/darwin" "xcbglintegrations" "platformthemes" "platforminputcontexts" "generic" "iconengines" "imageformats" "egldeviceintegrations"
-# QMAKE_DYNAMIC_LIST_FILE = "$$PWD/QtGui.dynlist"
 # QMAKE_LIBS = "$$QMAKE_LIBS_GUI"
 
 ## Scopes:
@@ -376,8 +373,13 @@ qt_extend_target(Gui CONDITION APPLE
         painting/qcoregraphics.mm painting/qcoregraphics_p.h
         painting/qrasterbackingstore.cpp painting/qrasterbackingstore_p.h
         platform/darwin/qmacmime.mm platform/darwin/qmacmime_p.h
+        text/coretext/qcoretextfontdatabase.mm text/coretext/qcoretextfontdatabase_p.h
+        text/coretext/qfontengine_coretext.mm text/coretext/qfontengine_coretext_p.h
     LIBRARIES
+        ${FWCoreFoundation}
         ${FWCoreGraphics}
+        ${FWCoreText}
+        ${FWFoundation}
     PUBLIC_LIBRARIES
         ${FWImageIO}
 )
@@ -398,50 +400,44 @@ qt_extend_target(Gui CONDITION WIN32
         dxguid
 )
 
-#### Keys ignored in scope 8:.:.:gui.pro:WIN32:
+#### Keys ignored in scope 7:.:.:gui.pro:WIN32:
 # CMAKE_WINDOWS_BUILD = "True"
 
-#### Keys ignored in scope 10:.:.:gui.pro:NOT mingw OR QT_FEATURE_debug_and_release:
-# debug_suffix = "d"
-
-#### Keys ignored in scope 12:.:.:gui.pro:QT_FEATURE_egl:
+#### Keys ignored in scope 8:.:.:gui.pro:QT_FEATURE_egl:
 # CMAKE_EGL_LIBS = "$$cmakeProcessLibs($$QMAKE_LIBS_EGL)"
 
-#### Keys ignored in scope 13:.:.:gui.pro:NOT QMAKE_LIBDIR_EGL_ISEMPTY:
+#### Keys ignored in scope 9:.:.:gui.pro:NOT QMAKE_LIBDIR_EGL_ISEMPTY:
 # CMAKE_EGL_LIBDIR = "$$cmakeTargetPath($$QMAKE_LIBDIR_EGL)"
 
-#### Keys ignored in scope 14:.:.:gui.pro:QT_FEATURE_opengles2:
+#### Keys ignored in scope 10:.:.:gui.pro:QT_FEATURE_opengles2:
 # CMAKE_GL_HEADER_NAME = "GLES2/gl2.h"
 # CMAKE_OPENGL_INCDIRS = "$$cmakePortablePaths($$QMAKE_INCDIR_OPENGL_ES2)"
 # CMAKE_OPENGL_LIBS = "$$cmakeProcessLibs($$QMAKE_LIBS_OPENGL_ES2)"
 # CMAKE_QT_OPENGL_IMPLEMENTATION = "GLESv2"
 
-#### Keys ignored in scope 15:.:.:gui.pro:NOT QMAKE_INCDIR_OPENGL_ES2_ISEMPTY:
+#### Keys ignored in scope 11:.:.:gui.pro:NOT QMAKE_INCDIR_OPENGL_ES2_ISEMPTY:
 # CMAKE_GL_INCDIRS = "$$cmakeTargetPaths($$QMAKE_INCDIR_OPENGL_ES2)"
 
-#### Keys ignored in scope 16:.:.:gui.pro:NOT QMAKE_LIBDIR_OPENGL_ES2_ISEMPTY:
+#### Keys ignored in scope 12:.:.:gui.pro:NOT QMAKE_LIBDIR_OPENGL_ES2_ISEMPTY:
 # CMAKE_OPENGL_LIBDIR = "$$cmakePortablePaths($$QMAKE_LIBDIR_OPENGL_ES2)"
 
-#### Keys ignored in scope 18:.:.:gui.pro:QT_FEATURE_opengl:
+#### Keys ignored in scope 14:.:.:gui.pro:QT_FEATURE_opengl:
 # CMAKE_GL_HEADER_NAME = "GL/gl.h"
 # CMAKE_OPENGL_INCDIRS = "$$cmakePortablePaths($$QMAKE_INCDIR_OPENGL)"
 # CMAKE_QT_OPENGL_IMPLEMENTATION = "GL"
 
-#### Keys ignored in scope 19:.:.:gui.pro:NOT QMAKE_INCDIR_OPENGL_ISEMPTY:
+#### Keys ignored in scope 15:.:.:gui.pro:NOT QMAKE_INCDIR_OPENGL_ISEMPTY:
 # CMAKE_GL_INCDIRS = "$$cmakeTargetPaths($$QMAKE_INCDIR_OPENGL)"
 
-#### Keys ignored in scope 20:.:.:gui.pro:NOT QT_FEATURE_dynamicgl:
+#### Keys ignored in scope 16:.:.:gui.pro:NOT QT_FEATURE_dynamicgl:
 # CMAKE_OPENGL_LIBS = "$$cmakeProcessLibs($$QMAKE_LIBS_OPENGL)"
 
-#### Keys ignored in scope 21:.:.:gui.pro:NOT QMAKE_LIBDIR_OPENGL_ISEMPTY:
+#### Keys ignored in scope 17:.:.:gui.pro:NOT QMAKE_LIBDIR_OPENGL_ISEMPTY:
 # CMAKE_OPENGL_LIBDIR = "$$cmakePortablePaths($$QMAKE_LIBDIR_OPENGL)"
 
-#### Keys ignored in scope 22:.:.:gui.pro:APPLE:
+#### Keys ignored in scope 18:.:.:gui.pro:APPLE:
 # CMAKE_GL_HEADER_NAME = "gl.h"
 
-#### Keys ignored in scope 23:.:.:gui.pro:QT_FEATURE_egl:
-# CMAKE_EGL_INCDIRS = "$$cmakePortablePaths($$QMAKE_INCDIR_EGL)"
-
 qt_extend_target(Gui CONDITION QT_FEATURE_accessibility
     SOURCES
         accessible/qaccessible.cpp accessible/qaccessible.h
@@ -459,20 +455,19 @@ qt_extend_target(Gui CONDITION APPLE AND QT_FEATURE_accessibility
         ${FWFoundation}
 )
 
-qt_extend_target(Gui CONDITION WIN32 AND NOT WINRT AND QT_FEATURE_accessibility
+qt_extend_target(Gui CONDITION QT_FEATURE_accessibility AND WIN32 AND NOT WINRT
     SOURCES
-        accessible/windows/apisupport/qwindowsuiawrapper_p.h
+        accessible/windows/apisupport/qwindowsuiawrapper.cpp accessible/windows/apisupport/qwindowsuiawrapper_p.h
         accessible/windows/apisupport/uiaattributeids_p.h
+        accessible/windows/apisupport/uiaclientinterfaces_p.h
         accessible/windows/apisupport/uiacontroltypeids_p.h
         accessible/windows/apisupport/uiaerrorids_p.h
         accessible/windows/apisupport/uiaeventids_p.h
         accessible/windows/apisupport/uiageneralids_p.h
-        accessible/windows/apisupport/uiaserverinterfaces_p.h
-        accessible/windows/apisupport/uiaclientinterfaces_p.h
         accessible/windows/apisupport/uiapatternids_p.h
         accessible/windows/apisupport/uiapropertyids_p.h
+        accessible/windows/apisupport/uiaserverinterfaces_p.h
         accessible/windows/apisupport/uiatypes_p.h
-        accessible/windows/apisupport/qwindowsuiawrapper.cpp
 )
 
 qt_extend_target(Gui CONDITION QT_FEATURE_action
@@ -514,39 +509,10 @@ qt_extend_target(Gui CONDITION QT_FEATURE_png
         WrapPNG::WrapPNG
 )
 
-qt_extend_target(Gui CONDITION QT_FEATURE_freetype
-    SOURCES
-        text/freetype/qfontengine_ft.cpp text/freetype/qfontengine_ft_p.h
-        text/freetype/qfreetypefontdatabase.cpp text/freetype/qfreetypefontdatabase_p.h
-    LIBRARIES
-        WrapFreetype::WrapFreetype
-)
-
-qt_extend_target(Gui CONDITION APPLE
-    SOURCES
-        text/coretext/qcoretextfontdatabase.mm text/coretext/qcoretextfontdatabase_p.h
-        text/coretext/qfontengine_coretext.mm text/coretext/qfontengine_coretext_p.h
-    LIBRARIES
-        ${FWCoreFoundation}
-        ${FWCoreGraphics}
-        ${FWCoreText}
-        ${FWFoundation}
-)
-
-qt_extend_target(Gui CONDITION MACOS
-    LIBRARIES
-        ${FWAppKit}
-)
-
-qt_extend_target(Gui CONDITION UIKIT
-    LIBRARIES
-        ${FWUIKit}
-)
-
-#### Keys ignored in scope 39:.:image:image/image.pri:WIN32 AND mingw:
+#### Keys ignored in scope 38:.:image:image/image.pri:WIN32 AND MINGW:
 # GCC_VERSION = "$${QMAKE_GCC_MAJOR_VERSION}.$${QMAKE_GCC_MINOR_VERSION}.$${QMAKE_GCC_PATCH_VERSION}"
 
-qt_extend_target(Gui CONDITION ((QT_FEATURE_png) AND (WIN32 AND mingw)) AND (GCC_VERSION___equals___8.1.0)
+qt_extend_target(Gui CONDITION ((QT_FEATURE_png) AND (WIN32 AND MINGW)) AND (GCC_VERSION___equals___8.1.0)
     COMPILE_OPTIONS
         -fno-reorder-blocks-and-partition
 )
@@ -678,6 +644,24 @@ qt_extend_target(Gui CONDITION QT_FEATURE_cssparser
         text/qcssparser.cpp text/qcssparser_p.h
 )
 
+qt_extend_target(Gui CONDITION QT_FEATURE_freetype
+    SOURCES
+        text/freetype/qfontengine_ft.cpp text/freetype/qfontengine_ft_p.h
+        text/freetype/qfreetypefontdatabase.cpp text/freetype/qfreetypefontdatabase_p.h
+    LIBRARIES
+        WrapFreetype::WrapFreetype
+)
+
+qt_extend_target(Gui CONDITION APPLE AND NOT MACOS
+    LIBRARIES
+        ${FWUIKit}
+)
+
+qt_extend_target(Gui CONDITION APPLE AND QT_FEATURE_freetype
+    LIBRARIES
+        WrapFreetype::WrapFreetype
+)
+
 qt_extend_target(Gui CONDITION UNIX AND NOT ANDROID AND NOT INTEGRITY AND NOT (TEST_architecture_arch STREQUAL "arm64") AND NOT UIKIT
     DEFINES
         ENABLE_PIXMAN_DRAWHELPERS
@@ -743,6 +727,7 @@ qt_extend_target(Gui CONDITION QT_FEATURE_vulkan
         Vulkan::Vulkan_nolink
 )
 
+#### Keys ignored in scope 89:.:vulkan:vulkan/vulkan.pri:QT_FEATURE_vkgen:
 # special case begin
 # We must always generate syncqt-injected header files,
 # because we added a custom command earlier for those for framework builds.
@@ -798,10 +783,10 @@ add_custom_command(
 # qvkgen_pimpl.input = "QMAKE_QVKGEN_INPUT"
 # qvkgen_pimpl.output = "$$OUT_PWD/vulkan/qvulkanfunctions_p.cpp"
 
-#### Keys ignored in scope 84:.:vulkan:vulkan/vulkan.pri:QT_FEATURE_vulkan:
+#### Keys ignored in scope 90:.:vulkan:vulkan/vulkan.pri:QT_FEATURE_vulkan:
 # qvkgen_h.variable_out = "HEADERS"
 
-#### Keys ignored in scope 85:.:vulkan:vulkan/vulkan.pri:else:
+#### Keys ignored in scope 91:.:vulkan:vulkan/vulkan.pri:else:
 # qvkgen_h.CONFIG = "target_predeps" "no_link"
 
 qt_extend_target(Gui CONDITION WASM
@@ -824,15 +809,6 @@ qt_extend_target(Gui # special case CONDITION NOT GCC OR NOT QT_COMPILER_VERSION
         "painting/qdrawhelper.cpp"
 )
 
-qt_extend_target(Gui CONDITION QT_FEATURE_undocommand
-    SOURCES
-        util/qundostack.cpp util/qundostack.h util/qundostack_p.h
-)
-
-qt_extend_target(Gui CONDITION QT_FEATURE_undogroup
-    SOURCES
-        util/qundogroup.cpp util/qundogroup.h
-)
 
 qt_create_tracepoints(Gui qtgui.tracepoints)
 qt_add_docs(Gui