[Qt 6.2] Update Qt6 to 6.2 (#18687)

* [qt6] Update to 6.1.1

* version stuff

* fix empty dir

* update version

* fix casing in qtbase

* [libpq] add secure32.lib on windows

* add clang-cl fix

* version stuff

* fix flag removal by adding a space

* version stuff

* make qt6->Qt6 usage consistent since Qt6 refers to itself as Qt6 with uppercase Q

* fix libpq wrapper opensll linkage on linux

* use policy to fix dependent ports

* version stuff

* use upstream patch

* version stuff

* fix source_location with clang-cl

* version stuff

* add all new modules

* add all modules to the qt port

* push all the ports

* fix patch

* update ports

* split qt_install_submodule into smaller functions

* add qlitehtml submodule to qttools

* update a few ports before moving to beta

* update vcpkg.json and refs and fix issue with update

* fix dependencies

* remove patch

* update to 6.2

* add nodejs to vcpkg_find_acquire_program for qtwebengine

* format manifest.

* fix webengine and see if it builds.

* apply format diff

* add patch

* fix arm builds

* fix linux gcc 7.5 build error

* fix patch

* bump version in qtbase otherwise CI seems to resuse the wrong version

* fix webengine release build

* try fixing gcc 7.5 build

* revert gcc 7.5 fixes since they broke osx

* revert gcc 7.5 fixes since they broke osx

* fix qtimageformats.

* actually enable new qt6 builds.

* fix search path for nodejs.

* fix the webengine patch again.

* fix wrong binary name

* revisit all dependencies

* revisit webengine features and build settings

* more feature stuff

* remove qt6betablock and more features review for qt 6.2

* add missing qt prefix.

* format manifest

* fix ci issues

* format manifest.

* add node on osx.

* install node on linux

* fix a typo and a disable another find_package

* fix mingw build issues and switch to not using tag

* use CMAKE_HOST_WIN32 instead

* update ref

* fix core configure error

* fix mingw case.

* fix script installation

* remove qmake helper scrpt

* delete debug folder if empty

* add vcpkg-tool-nodejs

* revert changes in the pipeline scripts

* adjust qtwebengine to the changes

* format manifest and revert doc changes

* fix message and logic

* fix hashes and make host only port

* fix hash again?

* qttools add linguist feature for crossbuilds

* fix dependency

* add thread and future to concurrent feature

* add assistant as a required host feature
(somebody should tell Qt not to do that)

* fix dependency.

* [skip ci] not a host dep?!?

* [skip ci] debuging

* [skip ci] more debug messages

* [skip ci] try always redownloading

* [skip ci] fix hash und skip hash for redownloading once

* [skip ci] comment out skip sha and redownload

* add vcpkg_fixup_pkgconfig to libvpx

* qtwebengine requires qml and quick

* fix manifest format

* qtwebengine does not support static builds!

* remove unnecessary parts of the patch

* update to beta2

* add some " and a message in update mode

* [skip ci] remove old and reorder patches

* [skip ci] add qtpaths6

* [skip actions] fix webengine patch

* [skip actions] fix a few submodule refs

* [skip actions] fix qtwebengine

* [skip actions] remove qml feature from webengine in qt metaport

* qtdeclarative raise minimum cmake version

* use the tree id instead?

* [skip actions] raise minimum cmake version in qtquick3d

* fix fetching of unadvertised commit ids

* revert changes to vcpkg_from_git

* revert doc changes

* [skip actions] use the new FETCH_REF

* [skip actiosn] remove raise of minimum version to retry with new cmake version

* [skip actions] update to beta3

* revert removal of patch

* update to beta4
remove qtquickcontrols2 deps

* fix missing \

* [skip actions] fix gstreamer feature on windows

* [skip actions]
remove outdated patches
format qtmultimedia

* [skip actions] update to rc1

* [skip actions] remove patch for now

* update refs

* [skip actions] comment patch to try another patch in qtmultimedia

* x86 is not supported by qtwebengine (at least one of its internal third party deps fails due to x64 intrinsics.)

* Finalize for 6.2 release.
Open issues: QtWebengine and cross builds.

* version stuff

* fix semver in qtquickcontrols.

* version stuff

* revise qtwebengine supports expression

* update version

2 files changed, 101 insertions, 17 deletions

diff --git a/ports/qttools/portfile.cmake b/ports/qttools/portfile.cmake
index 77b2787d6..3f965aa52 100644
--- a/ports/qttools/portfile.cmake
+++ b/ports/qttools/portfile.cmake
@@ -33,9 +33,15 @@ set(${PORT}_PATCHES )#fix_static_build.patch)
 
 # General features:
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
+    FEATURES
+    "assistant" FEATURE_assistant
+    "designer" FEATURE_designer
+    "linguist" FEATURE_linguist
     INVERTED_FEATURES
-    "qdoc"  CMAKE_DISABLE_FIND_PACKAGE_Clang
-    "qdoc"  CMAKE_DISABLE_FIND_PACKAGE_WrapLibClang
+    "qdoc"   CMAKE_DISABLE_FIND_PACKAGE_Clang
+    "qdoc"   CMAKE_DISABLE_FIND_PACKAGE_WrapLibClang
+    "qml"    CMAKE_DISABLE_FIND_PACKAGE_Qt6Quick
+    "qml"    CMAKE_DISABLE_FIND_PACKAGE_Qt6QuickWidgets
     )
 
  set(TOOL_NAMES 
@@ -67,14 +73,52 @@ elseif(VCPKG_TARGET_IS_OSX)
     list(APPEND TOOL_NAMES macdeployqt)
 endif()
 
-qt_install_submodule(PATCHES    ${${PORT}_PATCHES}
-                     TOOL_NAMES ${TOOL_NAMES}
-                     CONFIGURE_OPTIONS ${FEATURE_OPTIONS}
-                                       -DCMAKE_DISABLE_FIND_PACKAGE_Qt6AxContainer=ON
-                     CONFIGURE_OPTIONS_RELEASE
-                     CONFIGURE_OPTIONS_DEBUG
-                    )
-                    
+### Download third_party modules
+vcpkg_from_git(
+    OUT_SOURCE_PATH SOURCE_PATH_QLITEHTML
+    URL git://code.qt.io/playground/qlitehtml.git # git://code.qt.io/playground/qlitehtml.git
+    REF 908670c5b68d3bcf4712019a028079b8b2042dd4
+    FETCH_REF master
+    HEAD_REF master
+)
+# port 'litehtml' is not in vcpkg!
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH_LITEHTML
+    REPO litehtml/litehtml
+    REF db7f59d5886fd50f84d48720c79dc2e6152efa83
+    SHA512 6beed53f8b779359eb2d08495547f9b4e3d02b70d68e035e6c188f009a283e630b3961caa472ce045799a9ef82e1cd6b3c63d8534e6e8127441944f4837a0352
+    HEAD_REF master
+)
+
+##### qt_install_submodule
+set(qt_plugindir ${QT6_DIRECTORY_PREFIX}plugins)
+set(qt_qmldir ${QT6_DIRECTORY_PREFIX}qml)
+
+qt_download_submodule(PATCHES ${${PORT}_PATCHES})
+if(QT_UPDATE_VERSION)
+    return()
+endif()
+file(COPY "${SOURCE_PATH_QLITEHTML}/" DESTINATION "${SOURCE_PATH}/src/assistant/qlitehtml")
+file(COPY "${SOURCE_PATH_LITEHTML}/" DESTINATION "${SOURCE_PATH}/src/assistant/qlitehtml/src/3rdparty/litehtml")
+
+
+if(_qis_DISABLE_NINJA)
+    set(_opt DISABLE_NINJA)
+endif()
+qt_cmake_configure(${_opt} 
+                   OPTIONS ${FEATURE_OPTIONS}
+                           -DCMAKE_DISABLE_FIND_PACKAGE_Qt6AxContainer=ON
+                   OPTIONS_DEBUG ${_qis_CONFIGURE_OPTIONS_DEBUG}
+                   OPTIONS_RELEASE ${_qis_CONFIGURE_OPTIONS_RELEASE})
+
+vcpkg_install_cmake(ADD_BIN_TO_PATH)
+
+qt_fixup_and_cleanup(TOOL_NAMES ${TOOL_NAMES})
+
+qt_install_copyright("${SOURCE_PATH}")
+
+##### qt_install_submodule
+
 if(VCPKG_TARGET_IS_OSX)
     set(OSX_APP_FOLDERS Designer.app Linguist.app pixeltool.app qdbusviewer.app)
     foreach(_appfolder IN LISTS OSX_APP_FOLDERS)
@@ -92,3 +136,9 @@ if(EXISTS "${configfile}" AND EXISTS "${CURRENT_PACKAGES_DIR}/tools/Qt6/bin/wind
     string(REPLACE [[${_IMPORT_PREFIX}/tools/Qt6/bin/windeployqt.exe]] [[${_IMPORT_PREFIX}/tools/Qt6/bin/windeployqt.debug.bat]] _contents "${_contents}")
     file(WRITE "${configfile}" "${_contents}")
 endif()
+
+file(GLOB_RECURSE debug_dir "${CURRENT_PACKAGES_DIR}/debug/*")
+list(LENGTH debug_dir debug_dir_elements)
+if(debug_dir_elements EQUAL 0)
+    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug")
+endif()
diff --git a/ports/qttools/vcpkg.json b/ports/qttools/vcpkg.json
index e9bd7dd30..cfdf1a272 100644
--- a/ports/qttools/vcpkg.json
+++ b/ports/qttools/vcpkg.json
@@ -1,29 +1,63 @@
 {
   "name": "qttools",
-  "version-semver": "6.1.3",
+  "version-semver": "6.2.0",
   "description": "Qt Tools",
   "homepage": "https://www.qt.io/",
   "dependencies": [
     {
       "name": "qtbase",
-      "default-features": false,
-      "features": [
-        "network"
-      ]
+      "default-features": false
     },
-    "qtdeclarative",
     {
       "name": "qttools",
       "host": true,
-      "default-features": false
+      "default-features": false,
+      "features": [
+        "assistant",
+        "linguist"
+      ]
     }
   ],
   "features": {
+    "assistant": {
+      "description": "Build Qt Assistant"
+    },
+    "designer": {
+      "description": "Build Qt Designer"
+    },
+    "linguist": {
+      "description": "Build Qt Linguist components",
+      "dependencies": [
+        {
+          "name": "qttools",
+          "default-features": false,
+          "features": [
+            "designer"
+          ]
+        }
+      ]
+    },
     "qdoc": {
       "description": "Build QDoc.",
       "dependencies": [
         "llvm"
       ]
+    },
+    "qml": {
+      "description": "Build QML imports",
+      "dependencies": [
+        {
+          "name": "qtbase",
+          "default-features": false,
+          "features": [
+            "gui"
+          ]
+        },
+        {
+          "name": "qtdeclarative",
+          "default-features": false
+        }
+      ]
     }
   }
 }