diff --git a/ports/cgal/CONTROL b/ports/cgal/CONTROL
index 8b007cd1d..60452db0f 100644
--- a/ports/cgal/CONTROL
+++ b/ports/cgal/CONTROL
@@ -1,9 +1,9 @@
 Source: cgal
-Version: 5.0.2-1
+Version: 5.0.2-2
 Build-Depends: mpfr, mpir, zlib, boost-format, boost-container, boost-ptr-container, boost-iterator, boost-variant, boost-any, boost-unordered, boost-random, boost-foreach, boost-graph, boost-heap, boost-logic, boost-multiprecision, boost-interval
 Homepage: https://github.com/CGAL/cgal
 Description: The Computational Geometry Algorithms Library (CGAL) is a C++ library that aims to provide easy access to efficient and reliable algorithms in computational geometry.
 
 Feature: qt
-Build-Depends: qt5-base, qt5-3d, qt5-svg, qt5-xmlpatterns, qt5-script, eigen3
+Build-Depends: qt5-base[core], qt5-3d, qt5-svg, qt5-xmlpatterns, qt5-script, eigen3
 Description: Qt GUI support for CGAL
diff --git a/ports/cutelyst2/CONTROL b/ports/cutelyst2/CONTROL
index 9211d2eee..16f848eef 100644
--- a/ports/cutelyst2/CONTROL
+++ b/ports/cutelyst2/CONTROL
@@ -1,4 +1,4 @@
 Source: cutelyst2
-Version: 2.9.0
+Version: 2.9.0-1
 Description: A C++ Web Framework built on top of Qt, using the simple approach of Catalyst (Perl) framework
-Build-Depends: qt5-base
+Build-Depends: qt5-base[core]
diff --git a/ports/kd-soap/CONTROL b/ports/kd-soap/CONTROL
index 2bc553cf5..e9d922e0f 100644
--- a/ports/kd-soap/CONTROL
+++ b/ports/kd-soap/CONTROL
@@ -1,5 +1,5 @@
 Source: kd-soap
-Version: 1.8.0-1
+Version: 1.8.0-2
 Description: A Qt-based client-side and server-side SOAP component
 Homepage: https://www.kdab.com/products/kd-soap
-Build-Depends: qt5-base
+Build-Depends: qt5-base[core]
diff --git a/ports/kf5archive/CONTROL b/ports/kf5archive/CONTROL
index 29e641a8f..a8f1d30ab 100644
--- a/ports/kf5archive/CONTROL
+++ b/ports/kf5archive/CONTROL
@@ -1,4 +1,4 @@
 Source: kf5archive
-Version: 5.64.0
+Version: 5.64.0-1
 Description: File compression
-Build-Depends: ecm, qt5-base, zlib, bzip2
+Build-Depends: ecm, qt5-base[core], zlib, bzip2
diff --git a/ports/kf5holidays/CONTROL b/ports/kf5holidays/CONTROL
index 0221e7177..c1545e979 100644
--- a/ports/kf5holidays/CONTROL
+++ b/ports/kf5holidays/CONTROL
@@ -1,4 +1,4 @@
 Source: kf5holidays
-Version: 5.64.0
+Version: 5.64.0-1
 Description: Holiday calculation library
-Build-Depends: ecm, qt5-base, qt5-tools
+Build-Depends: ecm, qt5-base[core], qt5-tools
diff --git a/ports/kf5plotting/CONTROL b/ports/kf5plotting/CONTROL
index ede11f24c..2eb191a71 100644
--- a/ports/kf5plotting/CONTROL
+++ b/ports/kf5plotting/CONTROL
@@ -1,5 +1,5 @@
 Source: kf5plotting
-Version: 5.64.0
+Version: 5.64.0-1
 Homepage: https://api.kde.org/frameworks/kplotting/html/index.html
 Description: Lightweight plotting framework
-Build-Depends: ecm, qt5-base, qt5-tools
+Build-Depends: ecm, qt5-base[core], qt5-tools
diff --git a/ports/kf5syntaxhighlighting/CONTROL b/ports/kf5syntaxhighlighting/CONTROL
index 43fde5781..52cca4b36 100644
--- a/ports/kf5syntaxhighlighting/CONTROL
+++ b/ports/kf5syntaxhighlighting/CONTROL
@@ -1,5 +1,5 @@
 Source: kf5syntaxhighlighting
-Version: 5.64.0
+Version: 5.64.0-1
 Homepage: https://github.com/KDE/syntax-highlighting
 Description: Syntax highlighting engine for Kate syntax definitions
-Build-Depends: ecm, qt5-base, qt5-tools, qt5-xmlpatterns
+Build-Depends: ecm, qt5-base[core], qt5-tools, qt5-xmlpatterns
diff --git a/ports/libqglviewer/CONTROL b/ports/libqglviewer/CONTROL
index aca80eac2..b5adc1913 100644
--- a/ports/libqglviewer/CONTROL
+++ b/ports/libqglviewer/CONTROL
@@ -1,4 +1,4 @@
 Source: libqglviewer
-Version: 2.7.2-2
+Version: 2.7.2-3
 Description: libQGLViewer is an open source C++ library based on Qt that eases the creation of OpenGL 3D viewers.
-Build-Depends: qt5-base
+Build-Depends: qt5-base[core]
diff --git a/ports/opencv2/CONTROL b/ports/opencv2/CONTROL
index 707970258..391621bee 100644
--- a/ports/opencv2/CONTROL
+++ b/ports/opencv2/CONTROL
@@ -1,5 +1,5 @@
 Source: opencv2
-Version: 2.4.13.7-1
+Version: 2.4.13.7-2
 Build-Depends: zlib
 Description: computer vision library, version 2
 Default-Features: eigen, jpeg, opengl, png, tiff
@@ -37,7 +37,7 @@ Build-Depends: libpng
 Description: PNG support for opencv
 
 Feature: qt
-Build-Depends: qt5-base
+Build-Depends: qt5-base[core]
 Description: Qt GUI support for opencv
 
 Feature: tiff
diff --git a/ports/opencv3/CONTROL b/ports/opencv3/CONTROL
index 11e18f4f9..a103e97a6 100644
--- a/ports/opencv3/CONTROL
+++ b/ports/opencv3/CONTROL
@@ -1,5 +1,5 @@
 Source: opencv3
-Version: 3.4.7-3
+Version: 3.4.7-4
 Build-Depends: protobuf, zlib
 Homepage: https://github.com/opencv/opencv
 Description: computer vision library
@@ -63,7 +63,7 @@ Build-Depends: libpng
 Description: PNG support for opencv
 
 Feature: qt
-Build-Depends: qt5-base
+Build-Depends: qt5-base[core]
 Description: Qt GUI support for opencv
 
 Feature: sfm
diff --git a/ports/opencv4/CONTROL b/ports/opencv4/CONTROL
index 8aa7e06d9..60c1e0aa7 100644
--- a/ports/opencv4/CONTROL
+++ b/ports/opencv4/CONTROL
@@ -66,7 +66,7 @@ Build-Depends: libpng
 Description: PNG support for opencv
 
 Feature: qt
-Build-Depends: qt5-base
+Build-Depends: qt5-base[core]
 Description: Qt GUI support for opencv
 
 Feature: sfm
diff --git a/ports/osg-qt/CONTROL b/ports/osg-qt/CONTROL
index 5d9506f19..da3776a04 100644
--- a/ports/osg-qt/CONTROL
+++ b/ports/osg-qt/CONTROL
@@ -1,4 +1,4 @@
 Source: osg-qt
-Version: Qt4-1
+Version: Qt4-2
 Description: osgQt - Qt project for making use of OpenSceneGraph(OSG) 
-Build-Depends: osg, protobuf, qt5-base
\ No newline at end of file
+Build-Depends: osg, protobuf, qt5-base[core]
\ No newline at end of file
diff --git a/ports/paraview/portfile.cmake b/ports/paraview/portfile.cmake
index 7da8d3bb4..84f1d1aab 100644
--- a/ports/paraview/portfile.cmake
+++ b/ports/paraview/portfile.cmake
@@ -5,7 +5,7 @@ if ("tools" IN_LIST FEATURES AND VCPKG_TARGET_IS_OSX)
 endif()
 
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
-    "cuda"         PARAVIEW_USE_CUDA            #untested; probably only affects internal VTK build so it does nothing here
+    "cuda"         PARAVIEW_USE_CUDA            #untested; probably only affects internal VTK build so it does nothing here 
     "all_modules"  PARAVIEW_BUILD_ALL_MODULES   #untested
     "mpi"          PARAVIEW_USE_MPI             #untested
     "vtkm"         PARAVIEW_USE_VTKM
@@ -23,8 +23,6 @@ vcpkg_from_github(
         paraview_build.patch
         remove_duplicates.patch # Missed something in the above patch
         cgns.patch
-        qt_plugin.patch # Remove with Qt version > 5.14
-        qt_static_plugins.patch # Remove with Qt version > 5.14
         python_include.patch
         python_wrapper.patch
         add-tools-option.patch
@@ -34,8 +32,8 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
     list(APPEND VisItPatches removedoublesymbols.patch)
 endif()
 
-#The following two dependencies should probably be their own port
-#but require additional patching in paraview to make it work.
+#The following two dependencies should probably be their own port 
+#but require additional patching in paraview to make it work. 
 
 #Get VisItBridge Plugin
 vcpkg_from_gitlab(
@@ -44,8 +42,8 @@ vcpkg_from_gitlab(
     REPO paraview/visitbridge
     REF c2605b5c3115bc4869c76a0d8bfdd8939b59f283
     SHA512 6d2c1d6e1cd345547926938451755e7a8be5dabd89e18a2ceb419db16c5b29f354554a5130eb365b7e522d655370fd4766953813ff530c06e4851fe26104ce58
-    PATCHES
-        VisIt_Build.patch
+    PATCHES 
+        VisIt_Build.patch        
         #removeunusedsymbols.patch # These also get remove in master of ParaView
         ${VisItPatches}
 )
@@ -67,7 +65,7 @@ if("python" IN_LIST FEATURES)
         -DPython3_FIND_REGISTRY=NEVER
         "-DPython3_EXECUTABLE:PATH=${PYTHON3}" # Required by more than one feature
         )
-
+  
     #VTK_PYTHON_SITE_PACKAGES_SUFFIX should be set to the install dir of the site-packages
 endif()
 
@@ -84,15 +82,15 @@ vcpkg_configure_cmake(
         -DVTK_MODULE_ENABLE_ParaView_qttesting=YES
         -DPARAVIEW_ENABLE_EMBEDDED_DOCUMENTATION:BOOL=OFF
         -DPARAVIEW_USE_QTHELP:BOOL=OFF
-
+        
         #A little bit of help in finding the boost headers
         "-DBoost_INCLUDE_DIR:PATH=${CURRENT_INSTALLED_DIR}/include"
-
+    
         # Workarounds for CMake issues
         -DHAVE_SYS_TYPES_H=0    ## For some strange reason the test first succeeds and then fails the second time around
-        -DWORDS_BIGENDIAN=0     ## Tests fails in VisItCommon.cmake for some unknown reason this is just a workaround since most systems are little endian.
+        -DWORDS_BIGENDIAN=0     ## Tests fails in VisItCommon.cmake for some unknown reason this is just a workaround since most systems are little endian. 
         ${ADDITIONAL_OPTIONS}
-
+       
         #-DPARAVIEW_ENABLE_FFMPEG:BOOL=OFF
 )
 if(CMAKE_HOST_UNIX)
@@ -122,7 +120,7 @@ set(TOOLS   paraview
             smTestDriver
             vtkProcessXML
             vtkWrapClientServer)
-
+            
 foreach(tool ${TOOLS})
     # Remove debug tools
     set(filename ${CURRENT_PACKAGES_DIR}/debug/bin/${tool}${VCPKG_TARGET_EXECUTABLE_SUFFIX})
@@ -137,7 +135,7 @@ foreach(tool ${TOOLS})
     if(EXISTS ${filename})
         file(REMOVE ${filename})
     endif()
-
+    
     # Move release tools
     set(filename ${CURRENT_PACKAGES_DIR}/bin/${tool}${VCPKG_TARGET_EXECUTABLE_SUFFIX})
     if(EXISTS ${filename})
@@ -165,7 +163,7 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
             file(RENAME "${CURRENT_PACKAGES_DIR}/debug/bin/${name}" "${CURRENT_PACKAGES_DIR}/debug/lib/${name}")
         endif()
     endmacro()
-
+    
     set(to_move Lib paraview-${VERSION} paraview-config)
     foreach(name ${to_move})
         move_bin_to_lib(${name})
@@ -179,4 +177,4 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
     endforeach()
 
     file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin)
-endif()
+endif()
\ No newline at end of file
diff --git a/ports/paraview/qt_plugin.patch b/ports/paraview/qt_plugin.patch
deleted file mode 100644
index 2f4763c49..000000000
--- a/ports/paraview/qt_plugin.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-diff --git a/Qt/Widgets/CMakeLists.txt b/Qt/Widgets/CMakeLists.txt
-index 93000c493..5f2a06752 100644
---- a/Qt/Widgets/CMakeLists.txt
-+++ b/Qt/Widgets/CMakeLists.txt
-@@ -139,17 +139,43 @@ set(CMAKE_AUTORCC 1)
- set(CMAKE_AUTOUIC 1)
- set(CMAKE_AUTOUIC_SEARCH_PATHS "${CMAKE_CURRENT_SOURCE_DIR}/Resources/UI")
- 
-+##
-+if(NOT PARAVIEW_BUILD_SHARED_LIBS) # Should be a check if Qt is built statically and not ParaView
-+    list(APPEND qt_components Svg Sql) # added due to svg rescources, sql due to VTK::GUISupportQtSQL 
-+    set(qt_plugin_list)
-+    foreach(qt_component ${qt_components})
-+        list(APPEND qt_plugin_list ${Qt5${qt_component}_PLUGINS})
-+        message(STATUS "QtPlugin List: ${qt_plugin_list}")
-+    endforeach()
-+    set(qt_plugin_source "${CMAKE_CURRENT_BINARY_DIR}/qt_static_plugins.cxx")
-+    if(EXISTS "${qt_plugin_source}")
-+        file(REMOVE "${qt_plugin_source}")
-+    endif()
-+    set(qt_source_text "#include <QtPlugin>\n")
-+    set(qt_source_text "#ifdef QT_STATIC\n")
-+    foreach(qt_plugin ${qt_plugin_list})
-+        STRING(REGEX REPLACE "[^:]+::" "" qt_plugin_name "${qt_plugin}")
-+        message(STATUS "RAW PLUGIN NAME: ${qt_plugin_name}")
-+        string(APPEND qt_source_text "  Q_IMPORT_PLUGIN(${qt_plugin_name})\n")
-+    endforeach()
-+    string(APPEND qt_source_text "#endif\n")
-+    file(WRITE "${qt_plugin_source}" "${qt_source_text}")
-+endif()
-+##
-+
- vtk_module_add_module(ParaView::pqWidgets
-   CLASSES ${classes}
-   SOURCES ${ui_files}
--          ${resource_files})
-+          ${resource_files}
-+          ${qt_plugin_source})
- vtk_module_link(ParaView::pqWidgets
-   PUBLIC
-     Qt5::Core
-     Qt5::Gui
-     Qt5::Widgets
-   PRIVATE
--    Qt5::Network)
-+    Qt5::Network
-+    ${qt_plugin_list})
- 
- if (APPLE)
-   vtk_module_link(ParaView::pqWidgets
diff --git a/ports/paraview/qt_static_plugins.patch b/ports/paraview/qt_static_plugins.patch
deleted file mode 100644
index e95685e60..000000000
--- a/ports/paraview/qt_static_plugins.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-diff --git a/CMake/ParaViewClient.cmake b/CMake/ParaViewClient.cmake
-index 31beb7e20..d4bb36844 100644
---- a/CMake/ParaViewClient.cmake
-+++ b/CMake/ParaViewClient.cmake
-@@ -263,7 +263,11 @@ IDI_ICON1 ICON \"${_paraview_client_APPLICATION_ICON}\"\n")
-   endif ()
- 
-   include("${_ParaViewClient_cmake_dir}/paraview-find-package-helpers.cmake" OPTIONAL)
--  find_package(Qt5 REQUIRED QUIET COMPONENTS Core Widgets)
-+  find_package(Qt5 REQUIRED QUIET COMPONENTS Core Widgets Svg Network Sql DBus OpenGL OpenGLExtensions)
-+  if(UNIX AND NOT APPLE)
-+    find_package(Qt5 REQUIRED QUIET COMPONENTS X11Extras)
-+    list(APPEND qt_additional_libs Qt5::X11Extras)
-+  endif()
- 
-   # CMake 3.13 started using Qt5's version variables to detect what version
-   # of Qt's tools to run for autorcc. However, they are looked up using the
-@@ -322,11 +322,36 @@ IDI_ICON1 ICON \"${_paraview_client_APPLICATION_ICON}\"\n")
-       FILES
-         ${_paraview_client_resource_files})
-   endif ()
-+  
-+  if(NOT PARAVIEW_BUILD_SHARED_LIBS) # Should be a check if Qt is built statically and not ParaView
-+    list(APPEND qt_components Svg Widgets Gui OpenGL OpenGLExtensions) # added due to svg rescources, sql due to VTK::GUISupportQtSQL 
-+    set(qt_plugin_list)
-+    foreach(qt_component ${qt_components})
-+        message(STATUS "Qt5${qt_component}_PLUGINS: ${Qt5${qt_component}_PLUGINS}")
-+        list(APPEND qt_plugin_list ${Qt5${qt_component}_PLUGINS})
-+        message(STATUS "QtPlugin List: ${qt_plugin_list}")
-+    endforeach()
-+    set(qt_plugin_source "${CMAKE_CURRENT_BINARY_DIR}/qt_static_plugins.cxx")
-+    if(EXISTS "${qt_plugin_source}")
-+        file(REMOVE "${qt_plugin_source}")
-+    endif()
-+    set(qt_source_text "#include <QtPlugin>\n")
-+    string(APPEND qt_source_text "#ifdef QT_STATIC\n")
-+    foreach(qt_plugin ${qt_plugin_list})
-+        STRING(REGEX REPLACE "[^:]+::" "" qt_plugin_name "${qt_plugin}")
-+        message(STATUS "RAW PLUGIN NAME: ${qt_plugin_name}")
-+        string(APPEND qt_source_text "  Q_IMPORT_PLUGIN(${qt_plugin_name})\n")
-+    endforeach()
-+    string(APPEND qt_source_text "#endif\n")
-+    file(WRITE "${qt_plugin_source}" "${qt_source_text}")
-+  endif()
-+  
-   add_executable("${_paraview_client_NAME}" ${_paraview_client_executable_flags}
-     ${_paraview_client_SOURCES}
-     ${_paraview_client_resource_files}
-     ${_paraview_client_source_files}
--    ${_paraview_client_extra_sources})
-+    ${_paraview_client_extra_sources}
-+    ${qt_plugin_source})
-   if (DEFINED _paraview_client_NAMESPACE)
-     add_executable("${_paraview_client_NAMESPACE}::${_paraview_client_NAME}" ALIAS "${_paraview_client_NAME}")
-   endif ()
-@@ -338,9 +362,20 @@ IDI_ICON1 ICON \"${_paraview_client_APPLICATION_ICON}\"\n")
-       "$<TARGET_PROPERTY:VTK::vtksys,INTERFACE_INCLUDE_DIRECTORIES>")
-   target_link_libraries("${_paraview_client_NAME}"
-     PRIVATE
-+      ${qt_plugin_list}
-+      Qt5::Svg  ## added
-+      Qt5::Sql ## added
-+      Qt5::Network ## added
-+      Qt5::Gui ## added
-+      Qt5::OpenGL
-+      Qt5::OpenGLExtensions
-+      Qt5::DBus ##added
-+      ${qt_additional_libs}
-+      Qt5::Core # needed in VCPKG due to the extra Wrapper 
-       ParaView::pqApplicationComponents
-       Qt5::Widgets
--      VTK::vtksys)
-+      VTK::vtksys
-+      )
- 
-   set(_paraview_client_export)
-   if (DEFINED _paraview_client_EXPORT)
diff --git a/ports/qca/CONTROL b/ports/qca/CONTROL
index 356dff560..0eadcc148 100644
--- a/ports/qca/CONTROL
+++ b/ports/qca/CONTROL
@@ -1,5 +1,5 @@
 Source: qca
-Version: 2.2.1
+Version: 2.2.1-1
 Description: Qt Cryptographic Architecture (QCA).
 Homepage: https://cgit.kde.org/qca.git/
-Build-Depends: qt5-base
+Build-Depends: qt5-base[core]
diff --git a/ports/qcustomplot/CONTROL b/ports/qcustomplot/CONTROL
index 90eb89b22..ec7dac08f 100644
--- a/ports/qcustomplot/CONTROL
+++ b/ports/qcustomplot/CONTROL
@@ -1,4 +1,4 @@
 Source: qcustomplot
-Version: 2.0.1-3
+Version: 2.0.1-4
 Description: QCustomPlot is a Qt C++ widget for plotting and data visualization.
-Build-Depends: qt5-base
+Build-Depends: qt5-base[core]
diff --git a/ports/qscintilla/CONTROL b/ports/qscintilla/CONTROL
index 0c8fea940..6f730f993 100644
--- a/ports/qscintilla/CONTROL
+++ b/ports/qscintilla/CONTROL
@@ -1,5 +1,5 @@
 Source: qscintilla
-Version: 2.11.4-1
+Version: 2.11.4-2
 Homepage: https://www.riverbankcomputing.com/software/qscintilla
 Description: QScintilla is a port to Qt of the Scintilla editing component. Features syntax highlighting, code-completion and much more (Barebone build without python bindings (missing dependeny PyQt) and without QtDesigner plugin)
-Build-Depends: qt5-base, qt5-macextras (osx), qt5-winextras (windows)
\ No newline at end of file
+Build-Depends: qt5-base[core], qt5-macextras (osx), qt5-winextras (windows)
\ No newline at end of file
diff --git a/ports/qt-advanced-docking-system/CONTROL b/ports/qt-advanced-docking-system/CONTROL
index 478551458..81ef72515 100644
--- a/ports/qt-advanced-docking-system/CONTROL
+++ b/ports/qt-advanced-docking-system/CONTROL
@@ -1,5 +1,5 @@
 Source: qt-advanced-docking-system
-Version: 3.2.5-1
-Build-Depends: qt5-base, zlib, bzip2
+Version: 3.2.5-2
+Build-Depends: qt5-base[core], zlib, bzip2
 Description: Create customizable layouts using an advanced window docking system similar to what is found in many popular IDEs such as Visual Studio
 Homepage: https://github.com/githubuser0xFFFF/Qt-Advanced-Docking-System
diff --git a/ports/qt5-3d/CONTROL b/ports/qt5-3d/CONTROL
index 44c9fa1e0..179432bfb 100644
--- a/ports/qt5-3d/CONTROL
+++ b/ports/qt5-3d/CONTROL
@@ -1,4 +1,4 @@
 Source: qt5-3d
-Version: 5.12.8
+Version: 5.15.0
 Description: Qt5 3d Module - Functionality for near-realtime simulation systems with support for 2D and 3D rendering
-Build-Depends:  qt5-base, qt5-declarative, qt5-imageformats, qt5-gamepad
+Build-Depends:  qt5-base[core], qt5-declarative, qt5-imageformats, qt5-gamepad
diff --git a/ports/qt5-activeqt/CONTROL b/ports/qt5-activeqt/CONTROL
index fc9fabd03..dc7a4cd81 100644
--- a/ports/qt5-activeqt/CONTROL
+++ b/ports/qt5-activeqt/CONTROL
@@ -1,5 +1,5 @@
 Source: qt5-activeqt
-Version: 5.12.8-1
+Version: 5.15.0
 Description: Qt5 ActiveQt Module - ActiveX components
-Build-Depends:  qt5-base, qt5-declarative
+Build-Depends:  qt5-base[core], qt5-declarative
 Supports: windows
\ No newline at end of file
diff --git a/ports/qt5-androidextras/CONTROL b/ports/qt5-androidextras/CONTROL
index 64057aa0c..d10b89be0 100644
--- a/ports/qt5-androidextras/CONTROL
+++ b/ports/qt5-androidextras/CONTROL
@@ -1,5 +1,5 @@
 Source: qt5-androidextras
-Version: 5.12.8
+Version: 5.15.0
 Description: Qt5 androidextras Module; 
-Build-Depends:  qt5-base
+Build-Depends:  qt5-base[core]
 Supports: android
\ No newline at end of file
diff --git a/ports/qt5-base/CONTROL b/ports/qt5-base/CONTROL
index 623d49f8e..4788f4b38 100644
--- a/ports/qt5-base/CONTROL
+++ b/ports/qt5-base/CONTROL
@@ -1,8 +1,8 @@
 Source: qt5-base
-Version: 5.12.8-6
+Version: 5.15.0
 Homepage: https://www.qt.io/
 Description: Qt5 Application Framework Base Module. Includes Core, GUI, Widgets, Networking, SQL, Concurrent and other essential qt components.
 Build-Depends: zlib, libjpeg-turbo, libpng, freetype, pcre2, harfbuzz, sqlite3, libpq, double-conversion, openssl, angle (!windows), egl-registry, icu (!uwp), fontconfig (!windows)
 
 Feature: latest
-Description: Build latest qt version (5.14.2) instead of LTS
+Description: Build latest qt version (5.15.0) instead of LTS (latest and LTS are currently the same)
diff --git a/ports/qt5-base/cmake/qt_port_hashes.cmake b/ports/qt5-base/cmake/qt_port_hashes.cmake
index b210e93e5..576ec28e3 100644
--- a/ports/qt5-base/cmake/qt_port_hashes.cmake
+++ b/ports/qt5-base/cmake/qt_port_hashes.cmake
@@ -1,56 +1,55 @@
 #Every update requires an update of these hashes and the version within the control file of each of the 32 ports. 
 #So it is probably better to have a central location for these hashes and let the ports update via a script
-set(QT_MAJOR_MINOR_VER 5.12)
-set(QT_PATCH_VER 8)
+set(QT_MAJOR_MINOR_VER 5.15)
+set(QT_PATCH_VER 0)
 set(QT_UPDATE_VERSION 0) # Switch to update qt and not build qt. Creates a file cmake/qt_new_hashes.cmake in qt5-base with the new hashes.
 
 set(QT_PORT_LIST base 3d activeqt charts connectivity datavis3d declarative gamepad graphicaleffects imageformats location macextras mqtt multimedia networkauth
                  purchasing quickcontrols quickcontrols2 remoteobjects script scxml sensors serialport speech svg tools virtualkeyboard webchannel websockets
-                 webview winextras xmlpatterns)
+                 webview winextras xmlpatterns doc x11extras androidextras translations serialbus webengine webglplugin wayland)
 
-set(QT_HASH_qt5-base                8b6ed392dddaa7cd438fabbeb96c2e8d9dd6906a65eedcd193528ffd71ea42870071fa0ecd6f43cc65900b3938d19ae5316c43201b7d260ef9107dcc3a1e5441)
-set(QT_HASH_qt5-3d                  7ccb8f0d072536422b1e23c56d95134524c2d83ec56818754bcfd710fe9be89e365afcca197900cb4ed4b9365ea6856bbbda89818e6f4b23b58c5a02386e5cc4)
-set(QT_HASH_qt5-activeqt            74273e51d58ed91a2dd36eb76bfc1d9c4292ddd9b41c69999c4154445f6f86500f63ec365559287df1e0e2b4b783dcc5914a96a6397f5281e8ba6089f9b51b20)
-set(QT_HASH_qt5-charts              72a672b53edc27785f64aefaa8f1ddb6a6fd2e35f6ade49d69499cbb94a702d744e1da656be47afee46f5926333a8d9c441b4564ec8216e994e6073f4e1a97fb)
-set(QT_HASH_qt5-connectivity        d92d75f7efd246ca0b308811ade9f1d9f6678a4381e9ecb1f8e361dc27834a61aeae6aab1f067e3a1dba301397ef3d896a0e33019ed7bd1a39e143f80c3f70b4)
-set(QT_HASH_qt5-datavis3d           d732dbc3c35372141a86524e04abc847c7a73b739ddf4c3699d81f71de549c88b8cdb155789d2effcbb5d1fc5751fe7059e0b37a39ee79cdfd88e91c1f65fa3f)
-set(QT_HASH_qt5-declarative         10fe641bfd910b2395c26431c8e1dcc3063f1a036abeb96b2486812ebaea7c83a87416db019d8a0bd3ae00838789f8327aead98e04e9dc805ec8b73ba5fc5357)
-set(QT_HASH_qt5-gamepad             b93903392e1b00db05a74a42feeb803c41cb86aee22e903905de70d3eb11e0aa95820d74ecca13b102661c3ddd216f26d81e2cb234e324f3ee3c869dc36b97a7)
-set(QT_HASH_qt5-graphicaleffects    53e69d6f6ec532124daca5fb9469dd395c984eaf823d7e83f8a61a40b37c9e448711e758648028bcb4ed7c2abe6f8928248a4269afeb4beb3683c8e47de2f2c3)
-set(QT_HASH_qt5-imageformats        db5f810a77adce6e0aed481e044e8c4a245b44e2340fddb4d1a46e85eaff0da14b8ad5104c3ff4114cb9b02074b5d5ce6931637534fb36d7c57ce4798278be4b)
-set(QT_HASH_qt5-location            9521ae946039c1409ce4ba0a4ab5473f8773b7ccf59cd23ea5df7c3727929dcc6852d2b7b677d67832c096721a25428d7b2417608a13d8f1750662dd24d6c3be)
-set(QT_HASH_qt5-macextras           9da4f5fc478d3e820636429fbc93904a9f70901a3a418f6441318fb3df2d321727ddcb2cd6550f48b98593bea6a255f5f3127623d75ed2391723013141b40f4f)
-set(QT_HASH_qt5-mqtt                43d60bb1d98692850d2b196018784fe6975aedf1b7daea76c9b14f40fc9b907d59025d5f94d34a246daa24b6af7908d1d5a4d86b9cbf642577c03db7989241f2)
-set(QT_HASH_qt5-multimedia          49e0f1205be497dac29af64532e6463e55a43ca8a3487950b9cc228297f9d11336e8b5a742607a3bca1818ed0ff9a3d0914569baa710c241f0837b5d97ee4048)
-set(QT_HASH_qt5-networkauth         df154398732011c01cf4ed819834e0c2b4e0620d43c62b8032d0687675706eaa6bffa98411316011886434c1fa2950a161be82a3997ab60182eec9483b8b3c50)
-set(QT_HASH_qt5-purchasing          192d43f05ffd90347341b32e1720a7112a9a565823ce4cdddb192bd402fb498c50ae1188ee937166819d8d578e57686f580f717dad820b306696d8db89ac85bc)
-set(QT_HASH_qt5-quickcontrols       d3e71c56dd9b0c76643b464a59420ed66a7850ae3f5d1c1fd396807a92b54bbeda72380e6f53bf00db18c5fa83fb5de3c332d6c6a1bb9e57d24ec5aef377fc0d)
-set(QT_HASH_qt5-quickcontrols2      e0b464500303a3e8ca5e821bd2d46f4bc19e0df5402aa566d797530b7310a095057b4726272a001bf38da59259cdd96d3b27630a6861e82d5a70910ddcb1c985)
-set(QT_HASH_qt5-remoteobjects       92497b0eb2383e7d7552b1af4eba3b452d0d5130c00ce0cd44dc9a3f906335ddcaba0392f94d5f43de6b9a154c7d2b14f5d5899e2312df5e0bdd80f4d96b115b)
-set(QT_HASH_qt5-script              11914d89ebe11bb0fbd211ec0f897b31f689d20874c3ab2de055abc87d5bb3b2052c47f83a6ae8bd00df2ce5f086683022124ac7e011a160853a00cd1bd534e3)
-set(QT_HASH_qt5-scxml               376307ef8cae3bb88192f2137bc804609c76685ce574af48dc5d3f6acd65018d1bbfc7ad0e184aac5ac7cb0a2fa42b21c6e96e548f31cfdad90a478ca043866b)
-set(QT_HASH_qt5-sensors             b3b74e8927ca277417777a979330b2de1e96814febf673c7e6f1b18eb17d2b0a92051049840431e7bb19329059ce89f17b5fcb152c804d30b287b351376cb9c8)
-set(QT_HASH_qt5-serialport          35400ffec4bf1993e29c5d2465439e3c085db0f97ffdcf37226078df5aa64dd7ffa531c27ef59d5c53ada5f89453eea416f369099205a1fbbf8279bed6c69f36)
-set(QT_HASH_qt5-speech              814b2bbadeac77e80b6c4b1a2586a733710d6e7bc80fa8f177ef36f0df4f6c39098ef6223fd16cd3287eb24b871a5f1589eb4301babe099cf91d3d89069c85c0)
-set(QT_HASH_qt5-svg                 2788206a3bb0a0190bc984042ca8c471ed50325eb358ae8c7b50a147df0fb94ef96535606f5c96823b0d3380ddbc556187e3b1ec818fee7e597592b844352a7d)
-set(QT_HASH_qt5-tools               1251244d4991f6d4b8fe2aba1ebf3aa74c4b0977b3106233a982b9cbf736697c133717e959915343dae6acfe7978f767ceed52771f28f1278e44bcfea6e883cd)
-set(QT_HASH_qt5-virtualkeyboard     938bfcdbe63354ee956cff2d3e40884c4cd531eb522cf2258d1ceb7de14e2aa4fb9dc43e2007fe99fae008e0161461347acb362a616b230ed8f1d9b77f3169a3)
-set(QT_HASH_qt5-webchannel          142eb16ed4dc061425d0c1b8be6e64a04b7cd58b77abb891bd6bcb304d94e642fd65ba8c4fd8c1d51ef2558bfc22d40adb90f4485dbea2a15da8dff8df9849d4)
-set(QT_HASH_qt5-websockets          1a6baee5be5cbfadb23ce969784cf15724c10a188448bb0f3bec85f3fe9324389827e71ae719a85254b87a43523977b03d692da8f5ac273e0e7a598b1fdbdfb9)
-set(QT_HASH_qt5-webview             68ad18555025ab4479b18b5c2f7cffbcb78608819901f91876291c60b53a248051c9306560ef4be15d9da3cd58b24ea42548620c3dd8db9d785efa1ec6779599)
-set(QT_HASH_qt5-winextras           2692984f7106a104025648845bc08fbc7486d37e69128397294d47a4c6f5378d5f41a9762693bd6ec7498e8afa2b88e645f0c3ca82914d8de3becb7d4d46761d)
-set(QT_HASH_qt5-xmlpatterns         1abf04685e169a149423b6f1d2ea9eb8d57a8e79aed6a9362333f50d747e71bfd385cc910901f4db05b672e7eea61de02079af47b1b297cbb24552e759bad93d)
+set(QT_HASH_qt5-base                c584d69e49f4959d9b8541f820f5ff1e6d1599697ad16976b47cbaaa902fc83e1ca4ae57d56d13574e42e5f602d4420245ad7fcfc13e224e10d4bbad6a537d1a)
+set(QT_HASH_qt5-3d                  0cc327438ec174bfc6b7b560b5957653d38cdcb1c94717e296c3f52f41750f1b95ad620e3c3777fdc9c63f885f8325b8c1d1befcc338a25fc65d3f62b2019185)
+set(QT_HASH_qt5-activeqt            de3c869fecb5692209d6c162ae925eafe34e1118f3074529388c99a825a7007c01f1a6e603f8e8f46b3e2ecd510e35ce4d0d74c4b57563ecc95bfcf0be9dc05c)
+set(QT_HASH_qt5-charts              8046f280f460da4bd010c96503e07811fd672981940477855511c21e11734872cbfdac2ffb5da0a26dbeeaf931bda2605c57dccaa45ab3ebf61272b9e29fd183)
+set(QT_HASH_qt5-connectivity        57f125d232d1b495e82dd0f52243b878c7f0d3ffd1c8f4a7ff92810167867e2a5e480f4e7a3d2f26bbebcf8693eacbced87504b54f79cc8d1c8caf5a8f2da8f2)
+set(QT_HASH_qt5-datavis3d           074abcd90cea37c24728d6065ee04048efb3b056dcea4e3fe9af1d270abf6bccda984b7fd91abbbefc9f059af34f53b2b8b42c096ac35e4921214f5eb9c09a83)
+set(QT_HASH_qt5-declarative         0ec3403286efea6d6ac975ea6bd4464ea656c031f5f27b852235fd69d316a627ac3ff2ea2c3cca0a5375ca278f592df3ecade4e98aa15ec92816a16927f56e5e)
+set(QT_HASH_qt5-gamepad             8f81564804c96273a60738fc3bb115d5b6409dd7627420bbe329d0fb6b3e3616123fa28b7fdbdde7f928275a024d499a2b2b86aace3a55c66b7ab80f64a7b465)
+set(QT_HASH_qt5-graphicaleffects    62b18a9032bc30468ad4dc95648b1234a71240467fe8ff34a76bc36ed4613eea279dfc6fe0bf8e7734143e8b6ec6442f5e2f92338c2233f4e396bd333e67bc0c)
+set(QT_HASH_qt5-imageformats        3ac441915f2354ebe3eb2f6785a806ebe8bc2562a3a7d7bd0dc3380fd8842ce8a8dcdb7a767750b4da3d2d6b7881a7b54bb6c37f89c46e1468f27fc77396c304)
+set(QT_HASH_qt5-location            36efb5a9a0eaaa6f2997c4d7a18307c69a80ae4caf901ab1d0efcc6cd6202dda6a10c8dac01baee44e84c14b8ab23204db1085445e1f3b42e9a0a21549eb624e)
+set(QT_HASH_qt5-macextras           f2551f6e61b100c9acfc624aca0b7fc329589c090f60cc271decff388dbca97f10fd68e7ad061a709754eb2eecc438fba4a2bff54db1f7b1524836fac7e612aa)
+set(QT_HASH_qt5-mqtt                9946e5a481d4fcc9ce8438c86f06d0ee4c1d6393163e0762217ca820fc61909784b617b794ee35c8f3e0ee7049ac367d1c17eed62717b64912b3642bb4ddf03c)
+set(QT_HASH_qt5-multimedia          120ff3be99c685fb5944da657d571d83c985e139a34b23f7527daf2a0fdde949a452d4c3691b41a86ed3f141decf1833f496b3b61fd87bc602b8164563cb79d6)
+set(QT_HASH_qt5-networkauth         d5d7e4522a4058775389fdbb048f71675f5c37add8bd634766fc1408ebed0f1ad2c230ceb2cdeb547bce73ee9386cf40585dfb9ca4182340f82a284f7b9b5ae3)
+set(QT_HASH_qt5-purchasing          9d4ed2d7810fdb052da86a2830bab912aec7fed5f7a5878a7133a976a788f8ab59d226a63a79a0c2fd162c3d86bf67c254d184f7422b75d4b0271175c355c61a)
+set(QT_HASH_qt5-quickcontrols       bdfe850e13275ae074c257b75697141a9b8af5a334e114d3ac28f68a820e4b9f40ad936db96dd119dcc77ca12d6aff84cee16613b0695f594c862dcfbf942a48)
+set(QT_HASH_qt5-quickcontrols2      560014b882ef9d274cb1532025cae79987eec3569541e111e91f047261fcd7f26fcb40689d8dd6921ae26fbf9cdee60a87d3a1c7212e547529ff4adf9c5cf136)
+set(QT_HASH_qt5-remoteobjects       4e8cbb0cbc86de625e8d6b7deb80799bb2a040749ff065d8c826d5695660d5538287d80c4f5845555bc1d1f36b481a9a03ac2d837d98e3bfd8e887fe54d4e691)
+set(QT_HASH_qt5-script              0f6b72b5b0a892ced4653e9184256040b12a804f796c922aad318fc03734e3bf8fbe175b0eb886e71899287082c09fc06a290dcd5ddb1967c65b0f72d4adea94)
+set(QT_HASH_qt5-scxml               196ab4a8609695bc442a915e229183f3ece97ed03c93cdc7f93bf6c7b68ea89a8a6ad04e3e4909c9aa0780d8ebd366338ea6e8790ac4fae08806694e27c115fa)
+set(QT_HASH_qt5-sensors             b03e2b68d14bfa557fdbf742d26c70a960b92cf5a5884d499825743553da42c5044cced338b86682081f57fea41686fc00c0565f3f4561d945e099de5b8ebc9e)
+set(QT_HASH_qt5-serialport          121837c0848c69414268332ac41538b9df1c1503ab81bcf281903b73e02f5adf34b615ebc1fca4f4e6bf0b7c8c1b3f2d4dcde20152e2eb913c965eb910e378e2)
+set(QT_HASH_qt5-speech              9a63c5957663db0c4b9587751b90d9d84881bb60f911435cb92998898944f6ed4e7aa7c12e8196a6b0c7bdac1d2abba62145b99cd834fbab1d57e88e60ddb59c)
+set(QT_HASH_qt5-svg                 24e5b3000ee6657e6c579026d979322aafaa42b3081e07bae17cf6f276a45a9d830db6b23fb7d30d6ff4f32f63c88e258dc55e193c45de8e4069aad14cfda71b)
+set(QT_HASH_qt5-tools               ebcebbc828e6a34766f2f5eeb4775d29af7b60b6124549df5256902ed2bd683721084b45a869ba76d29b1b170fe3834291af0833ab17ee8d05407c509f03d3eb)
+set(QT_HASH_qt5-virtualkeyboard     fd850aa11e0dbd37f73e63517af1e311be480fc44ac05e74c25794a69fd26d06fd620a9ee3ffa3663ebeeedc0d2abe9520aa53c09b80363e8966ee7f24430869)
+set(QT_HASH_qt5-webchannel          ef4040b63ad3cca80be38b8e3336ea0e70d1a57289ff2441c182f848b837d7ef87c78472f42f14cbc7a77f7ef5d5c50c0f5533071aaa13734832fdf6019c0253)
+set(QT_HASH_qt5-websockets          87d7cbce52562f6a5372106e46e15319d9647bab9ec5dbde132c017b9febbbc568ff2c182d3375165d87c1d4a88ae26d2e849baef53bce6e842d8d0d83f7ceb5)
+set(QT_HASH_qt5-webview             58356c59945fb075e17587b634156b66c5569cdbcf02ba91eb9fcc1146f1a4341e0d4d6afa0a70a6050070d35f156aa92a7aec0102aff0b862b5050533c55a5e)
+set(QT_HASH_qt5-winextras           ece6ad8cb8f43a8e43ed0f47323eb293d5c6329f32ccdd310ee3d3811006f81e63f8711e9c1a4630198087055fd6fb38012b4bcf0b008ac3d8da7eea6a461067)
+set(QT_HASH_qt5-xmlpatterns         180ccbab82b436702533ea7aaf445b399250555ed37eb3469889de64d13f218c0717489f270e29369119207441f85c05249923fe73daac5fcc2fdc7e970494c0)
 ##TODO
-set(QT_HASH_qt5-doc                 63505d7bec54b6bdd663fc0f3962c22470e61f55031c62b26656eb68dafa5c7f835f706a53c240922607106772c47f4bc7f3ca91aa71464bd29381a238b8465e)
-set(QT_HASH_qt5-x11extras           0b086747fc9be3bd83f83c0d95b5403e6cdf55f3d3727679f01caf3f211313c3da57e26706616275fc6c105d9ac12c8f2d87d0063b14c1de18ca1a70a928e68d)
-set(QT_HASH_qt5-androidextras       caed501bca871c8773d60fc4aa8c093918ffe0021f0bdded2c2e47b6ec49e9a1a100ab18add7d6c9702ace35bd94cd99b28e73778271b3fb28339b607f68861b)
-set(QT_HASH_qt5-canvas3d            5927ab205d6b15a6a8cef91610694d061ba5610afe5b83a44f9a118fbe30c56dea3e5048b37b4902b3675a094f48ad3d9c6294d3686ef4015dbcdcacdaf03555)
-set(QT_HASH_qt5-translations        bb46837f5069f622ba0c9b01d934abdea5ad82b5e2d96d268b7540e29d36f79261273b7e77da7979e18ca9e0b44556012e7f9827085cf1605fc629d877197b8a)
-set(QT_HASH_qt5-serialbus           5c9084852449813c47ca74448bb794c1f8fae1c012169e36175cc2a5c1f8dc956f43b8c112fcc147106b77db69d1c1b8be2f73d8072d49d5f7856a06323b0b24)
-set(QT_HASH_qt5-webengine           b0b5c979d0ce66effe15c152e11f6460226c61a030122d581aa10cc968484ff404b492146cabef313c3018b59a064324c373b886ffdd22efa9d2990b873b7d69)
-set(QT_HASH_qt5-webglplugin         c3741557c7298f30e88d26f22491520a825ec532778d2eb03f408fbed9bb19ad60702dce2bf5c9f347ea5f63a70dd3714a7cf54f204549c72b98817e275f97b3)
-set(QT_HASH_qt5-wayland             f973b24778227ae0d1e62f4b88703c0aafb6409a6150c5b38a6054e7f7e79cf4542f9c989e0c8d012758ae09b1389208fa2654166b5cf4d06011b1e9ad27205a)
-
+set(QT_HASH_qt5-doc                 8842c7e2a5e8042b8c22f305a46d8191d7cfcccd4ead175431ed83b2fde707466ea1798f7819b56ab991af942cb94551d20eb2c13edbe9beaafb9e6bb86fba3e)
+set(QT_HASH_qt5-x11extras           12fc870f94e546d6e343f2ece44d09a6fc725b3ce092e1494bd2ef334ec92b559db2a8fcf6da88fe0f73040ee41fa5bf5f84ff197e5d1a004dabca3274508a96)
+set(QT_HASH_qt5-androidextras       d1b4a88053bd6b771f392e843611bf8397d782cc263ee924440e0ed6f63cdc936a2c127d3eb5a1834c11ef0c6efc2c8468fb65a28ec7f7645286bdea1dad590c)
+#set(QT_HASH_qt5-canvas3d            0) deprectaed
+set(QT_HASH_qt5-translations        45302457e16e5dba674164dda7945110583f072d209d3984726324497efb367573475facc3534fd7cdfc61bc14295ebe4bf6588a37d45e87b676191d852f1c8a)
+set(QT_HASH_qt5-serialbus           8a606fd407cb7a4a6a1f15f10daec952aa010684d6cfca7fa024f850b3db419b7cd67eecb58ba0c0dd283e10fd904a255ab42b279c38081e84fe06b7b22c4c49)
+set(QT_HASH_qt5-webengine           11983470f0da9abfffba072406b2c67b475d8cf65412fdcfd925758e2a9449f509780e5b1001fb6868445c2c9540e5aa0e754954b70f1795b47335bad7c749b2)
+set(QT_HASH_qt5-webglplugin         cd8e63b8979601c3da37295148b7fe896863b97058d15fb9284a3eacca7fe62fae87dbd414285aee5df732ebadd67c96edd273ec9929ca005bf5282e4acb7cff)
+set(QT_HASH_qt5-wayland             e3d8fb79b7d3b10a94caccca1567c3a978b3517e13740aa6218d0a0b4cb180f6bdc3b533e113248908033f344ab5fcffd6fac751a1513c2d62834afe408ee714)
 
 if(QT_UPDATE_VERSION)
     message(STATUS "Running Qt in automatic version port update mode!")
diff --git a/ports/qt5-base/cmake/qt_port_hashes_latest.cmake b/ports/qt5-base/cmake/qt_port_hashes_latest.cmake
index 875b84405..fd74151f2 100644
--- a/ports/qt5-base/cmake/qt_port_hashes_latest.cmake
+++ b/ports/qt5-base/cmake/qt_port_hashes_latest.cmake
@@ -1,55 +1,55 @@
 #Every update requires an update of these hashes and the version within the control file of each of the 32 ports. 
 #So it is probably better to have a central location for these hashes and let the ports update via a script
-set(QT_MAJOR_MINOR_VER 5.14)
-set(QT_PATCH_VER 2)
+set(QT_MAJOR_MINOR_VER 5.15)
+set(QT_PATCH_VER 0)
 set(QT_UPDATE_VERSION 0) # Switch to update qt and not build qt. Creates a file cmake/qt_new_hashes.cmake in qt5-base with the new hashes.
 
 set(QT_PORT_LIST base 3d activeqt charts connectivity datavis3d declarative gamepad graphicaleffects imageformats location macextras mqtt multimedia networkauth
                  purchasing quickcontrols quickcontrols2 remoteobjects script scxml sensors serialport speech svg tools virtualkeyboard webchannel websockets
-                 webview winextras xmlpatterns)
+                 webview winextras xmlpatterns doc x11extras androidextras translations serialbus webengine webglplugin wayland)
 
-set(QT_HASH_qt5-base                8c83e06d58b56e9f288e83d6c3dd4ad6cc9f1eb1a32c7b44fb912fda34ed7255766fd9fa60cd740ee001df7d6172f25df05f1f95e986c3e793fbcd9bf4f18de9)
-set(QT_HASH_qt5-3d                  43053d001d59094bfac19c5bf3ad17df277c64d0c214b72d4cf02231396d9109a231da8d9d72ebe79822bc09ee24fa2387b4b120dbad43d69a49e3d66ee21da8)
-set(QT_HASH_qt5-activeqt            730a9086d09659e869045f2bc2a5eb43f99447e1bc176159bbc59175562ef6a562bd7a24f9923f4ceac12fdd902104fd7dbc418d8acda9b127c3e3f2d871a8f3)
-set(QT_HASH_qt5-charts              2776db3dfe6f6f1047bd19d8d936d3f72de46c0807bbf02ba874053113d76df4cf80497d5ed2cee192ad94abb8e12b4fbce8359a63d8beb1190d491fc2da35bc)
-set(QT_HASH_qt5-connectivity        948050b915f6f2e1fffcb2c8b55d9061f25a82314d02e7a39faa9b88e065bb924ce5f8a7c26ed1f07b29b986d47acd5678f57bb96668d1c1ecd93ad3a7e40c7a)
-set(QT_HASH_qt5-datavis3d           25d207e045e58f9edc3a661b641225f6a11eb45f723847281007fa53b753430dc5792e31bdd142c95e886bfda5f6d29826cd151cb23a1e1a81cc0b91d5f7a2f6)
-set(QT_HASH_qt5-declarative         48d3a547237514a8bdc2a4c0b3f97732abceacece0e0899d2f33787293eb99f54c28efce35a34b8c46dcd4d78ebbc88bfc820bc68496076eacace40aaceee004)
-set(QT_HASH_qt5-gamepad             23971fae9b1626afc005dccae3bb715f719695bf5e24a1711b3e7049ce49ef5c72097e1eb702464ab7663d41750bf4103e4ed78ee7954269921e3064b79f4c05)
-set(QT_HASH_qt5-graphicaleffects    fa6ed3eff243675f9d0bfa71b2886804e4902cf9d7d91d5dec0f8e4f060ee7c347ba7775a89e3f8effd0ffed8314f916b55f09056902abc892ee27e79ce2925c)
-set(QT_HASH_qt5-imageformats        e835489bdd1cf19aaa1c04e6ae1c480d4077cf24eee1d46b2f4deb03c093f64df6beaf83adb69b7edcba67c952a60deb89a26923addf2b4254aff18bc2ebf6a6)
-set(QT_HASH_qt5-location            ca11e118a9061f69ac0181db14b1bf92309c03615802092f7cf404c882108efa3acae9bb73ee3870ea68cd7d7d11863445fc72dcf52099d6be77e0986b7f012c)
-set(QT_HASH_qt5-macextras           99c8dc6a5cb6f62691d645a889d81438203f50eea19c25bfb0e3d784816712cd8ec01ed42fbc0db4307cf81d00b4c00a20b026683bbeef758a4f1888bc1e2094)
-set(QT_HASH_qt5-mqtt                8040b23c1078c53cc69f1a0e57e363bbc277c970f007058d168152cd0246062ef877d65928a4d6754f94c6aec696995fc88d166a84ba1678d999541b9a091c0d)
-set(QT_HASH_qt5-multimedia          5ebee0f96334d58b74ae344875aa93d32bfdd7c906856f84152e9ae0a3ebb12f627a0d3ab4552031b70c20ad59db1674b1a261ed0828e1efcc6ab48ba3718559)
-set(QT_HASH_qt5-networkauth         9001755ae289213f7d2c994bedbbcc1ca641b3c80fc5279f6829ed48c31eed8cdbd87a0ed0ce451bc9611318ef09ef7c40b795d2c45fface2bd357ee579b15ad)
-set(QT_HASH_qt5-purchasing          5576a5fbef50a25b2c3ebfbb674b630fad2f9b2c3e8737fe0db0b9374c8f07d47dc6212024af1fc6ce585787087a0da1a193cc964290370dcc0ec200c3ed5ccb)
-set(QT_HASH_qt5-quickcontrols       e5076d838e54e8fcc62ffd76d66ab322f1927f6489c51dd0fa6e39de1e003c1994d24730da79c8d9d2747839faaa7b1b78f14b58f05447db440a477094be40e4)
-set(QT_HASH_qt5-quickcontrols2      de8b669417c2d039c0f49e805be72e757877991bc3c7feb13417202a4964cb6391924837751c520ed6234930e90dfe00417ca1c369418b2cdf4f09da679ba722)
-set(QT_HASH_qt5-remoteobjects       0e9fe5d6bfa8ef5ecc8700c7b757d98ad6f6711c8b10667aedaa9dcb32ae201a12bb37fb2d7a827e1bec399c2a75e8cf40226ddd6810feb9c44e287974b5345e)
-set(QT_HASH_qt5-script              2eef6c4d23fccd67abc3647852ca92edd951b4ece8047f28571689a143421c5a1403ef0fcc96615e4ed708df64f7eede643d872fac850554031a17e2d907f398)
-set(QT_HASH_qt5-scxml               2e1cbea7c32d93675b4a67287dd17c9ed120a6655f8f9a30edfe12a16f67b3c5ad6d0fd04c0102297693bf87e225d81e963534958c8e73622c605388c9fc8425)
-set(QT_HASH_qt5-sensors             43872a51163317c2fb642f59a9e41ede77cb86d7148436d9e673ac94543fb8acffe4e040824dd88a9029943418a3371c77815b82a0a566426857d18fbc23e341)
-set(QT_HASH_qt5-serialport          4a4fb81bcccaddc5902223940031a9002395cbc5e99c78c1ac5df04031b6a0551bb340757f84bad82ca7ef551358c1eba3a035b0b8f4221f7db0ab738ac65b06)
-set(QT_HASH_qt5-speech              d3870cc66cba4f5dd2c0a2a4845defe4299de2d7affe12ccdadc4948116317590b580592d575cc5e8eb190043a92f38416e030f47cfb87f5cf3419a31152e00f)
-set(QT_HASH_qt5-svg                 b4cf8a7081e01caea3c71826d32ebb9da6a71bd4eab3cf353e87080009065aff2c533300c0c08a005ff8f441d2da641a097319114a5c11b618398fac41f574a7)
-set(QT_HASH_qt5-tools               e5b56d38acaa59511f24c817999f901510397d6e8baccc06a8fb8375f09b71dcffda4c57def4eb88d6c2782926d612b382957175a087a0c2224245051c54fe7e)
-set(QT_HASH_qt5-virtualkeyboard     752634de8796a1809818176db47021aa24de842cf6334d689a91d3b011105a5e2b8113615a8f50f6974bf8fa989026b434121b42278de1ef905075ba3ee72c47)
-set(QT_HASH_qt5-webchannel          57080c8cf7fb5c91fa6b325566d3fb2dc3c1d3bcd8128d2a40ea92f8bae7ca0f0fb4bac1d68452998a5dc06781155058d149df069fed5ff16b6d8ad43a72e002)
-set(QT_HASH_qt5-websockets          091e17459a8a255fccece092399ac32994307aa53e6e72e736e6ff9f1bb745c49bfcb9a747e1e21acaa0ed95754f7f450ba2f73a3bbafad54e21bf600f7da92f)
-set(QT_HASH_qt5-webview             1a70be0c64f72b7e3b10c8e3ca58d4a04bef14496c8e4852c5cafbd13d653e2f682a58f7dcd576fce79ed082c01a5f8ffc6533836f495f6e5d4b6ddf2be8e3ca)
-set(QT_HASH_qt5-winextras           2cd46242845ceb9d41d4d13cdda7697d9caa4cc3ee860ae9f4813192381fbaf3aa3124bf8998db28470479b8ebc755fe86607681696480300c65a7d9ed9073ef)
-set(QT_HASH_qt5-xmlpatterns         27f674c4811b010ec461c54ee258b1d6b58dcb5c11795621b7bbad9fa2c19c1b6b62286cbe8895151261129c7d6d91007c3a8be6cf64af1f4cb32e2e9976ac23)
+set(QT_HASH_qt5-base                c584d69e49f4959d9b8541f820f5ff1e6d1599697ad16976b47cbaaa902fc83e1ca4ae57d56d13574e42e5f602d4420245ad7fcfc13e224e10d4bbad6a537d1a)
+set(QT_HASH_qt5-3d                  0cc327438ec174bfc6b7b560b5957653d38cdcb1c94717e296c3f52f41750f1b95ad620e3c3777fdc9c63f885f8325b8c1d1befcc338a25fc65d3f62b2019185)
+set(QT_HASH_qt5-activeqt            de3c869fecb5692209d6c162ae925eafe34e1118f3074529388c99a825a7007c01f1a6e603f8e8f46b3e2ecd510e35ce4d0d74c4b57563ecc95bfcf0be9dc05c)
+set(QT_HASH_qt5-charts              8046f280f460da4bd010c96503e07811fd672981940477855511c21e11734872cbfdac2ffb5da0a26dbeeaf931bda2605c57dccaa45ab3ebf61272b9e29fd183)
+set(QT_HASH_qt5-connectivity        57f125d232d1b495e82dd0f52243b878c7f0d3ffd1c8f4a7ff92810167867e2a5e480f4e7a3d2f26bbebcf8693eacbced87504b54f79cc8d1c8caf5a8f2da8f2)
+set(QT_HASH_qt5-datavis3d           074abcd90cea37c24728d6065ee04048efb3b056dcea4e3fe9af1d270abf6bccda984b7fd91abbbefc9f059af34f53b2b8b42c096ac35e4921214f5eb9c09a83)
+set(QT_HASH_qt5-declarative         0ec3403286efea6d6ac975ea6bd4464ea656c031f5f27b852235fd69d316a627ac3ff2ea2c3cca0a5375ca278f592df3ecade4e98aa15ec92816a16927f56e5e)
+set(QT_HASH_qt5-gamepad             8f81564804c96273a60738fc3bb115d5b6409dd7627420bbe329d0fb6b3e3616123fa28b7fdbdde7f928275a024d499a2b2b86aace3a55c66b7ab80f64a7b465)
+set(QT_HASH_qt5-graphicaleffects    62b18a9032bc30468ad4dc95648b1234a71240467fe8ff34a76bc36ed4613eea279dfc6fe0bf8e7734143e8b6ec6442f5e2f92338c2233f4e396bd333e67bc0c)
+set(QT_HASH_qt5-imageformats        3ac441915f2354ebe3eb2f6785a806ebe8bc2562a3a7d7bd0dc3380fd8842ce8a8dcdb7a767750b4da3d2d6b7881a7b54bb6c37f89c46e1468f27fc77396c304)
+set(QT_HASH_qt5-location            36efb5a9a0eaaa6f2997c4d7a18307c69a80ae4caf901ab1d0efcc6cd6202dda6a10c8dac01baee44e84c14b8ab23204db1085445e1f3b42e9a0a21549eb624e)
+set(QT_HASH_qt5-macextras           f2551f6e61b100c9acfc624aca0b7fc329589c090f60cc271decff388dbca97f10fd68e7ad061a709754eb2eecc438fba4a2bff54db1f7b1524836fac7e612aa)
+set(QT_HASH_qt5-mqtt                9946e5a481d4fcc9ce8438c86f06d0ee4c1d6393163e0762217ca820fc61909784b617b794ee35c8f3e0ee7049ac367d1c17eed62717b64912b3642bb4ddf03c)
+set(QT_HASH_qt5-multimedia          120ff3be99c685fb5944da657d571d83c985e139a34b23f7527daf2a0fdde949a452d4c3691b41a86ed3f141decf1833f496b3b61fd87bc602b8164563cb79d6)
+set(QT_HASH_qt5-networkauth         d5d7e4522a4058775389fdbb048f71675f5c37add8bd634766fc1408ebed0f1ad2c230ceb2cdeb547bce73ee9386cf40585dfb9ca4182340f82a284f7b9b5ae3)
+set(QT_HASH_qt5-purchasing          9d4ed2d7810fdb052da86a2830bab912aec7fed5f7a5878a7133a976a788f8ab59d226a63a79a0c2fd162c3d86bf67c254d184f7422b75d4b0271175c355c61a)
+set(QT_HASH_qt5-quickcontrols       bdfe850e13275ae074c257b75697141a9b8af5a334e114d3ac28f68a820e4b9f40ad936db96dd119dcc77ca12d6aff84cee16613b0695f594c862dcfbf942a48)
+set(QT_HASH_qt5-quickcontrols2      560014b882ef9d274cb1532025cae79987eec3569541e111e91f047261fcd7f26fcb40689d8dd6921ae26fbf9cdee60a87d3a1c7212e547529ff4adf9c5cf136)
+set(QT_HASH_qt5-remoteobjects       4e8cbb0cbc86de625e8d6b7deb80799bb2a040749ff065d8c826d5695660d5538287d80c4f5845555bc1d1f36b481a9a03ac2d837d98e3bfd8e887fe54d4e691)
+set(QT_HASH_qt5-script              0f6b72b5b0a892ced4653e9184256040b12a804f796c922aad318fc03734e3bf8fbe175b0eb886e71899287082c09fc06a290dcd5ddb1967c65b0f72d4adea94)
+set(QT_HASH_qt5-scxml               196ab4a8609695bc442a915e229183f3ece97ed03c93cdc7f93bf6c7b68ea89a8a6ad04e3e4909c9aa0780d8ebd366338ea6e8790ac4fae08806694e27c115fa)
+set(QT_HASH_qt5-sensors             b03e2b68d14bfa557fdbf742d26c70a960b92cf5a5884d499825743553da42c5044cced338b86682081f57fea41686fc00c0565f3f4561d945e099de5b8ebc9e)
+set(QT_HASH_qt5-serialport          121837c0848c69414268332ac41538b9df1c1503ab81bcf281903b73e02f5adf34b615ebc1fca4f4e6bf0b7c8c1b3f2d4dcde20152e2eb913c965eb910e378e2)
+set(QT_HASH_qt5-speech              9a63c5957663db0c4b9587751b90d9d84881bb60f911435cb92998898944f6ed4e7aa7c12e8196a6b0c7bdac1d2abba62145b99cd834fbab1d57e88e60ddb59c)
+set(QT_HASH_qt5-svg                 24e5b3000ee6657e6c579026d979322aafaa42b3081e07bae17cf6f276a45a9d830db6b23fb7d30d6ff4f32f63c88e258dc55e193c45de8e4069aad14cfda71b)
+set(QT_HASH_qt5-tools               ebcebbc828e6a34766f2f5eeb4775d29af7b60b6124549df5256902ed2bd683721084b45a869ba76d29b1b170fe3834291af0833ab17ee8d05407c509f03d3eb)
+set(QT_HASH_qt5-virtualkeyboard     fd850aa11e0dbd37f73e63517af1e311be480fc44ac05e74c25794a69fd26d06fd620a9ee3ffa3663ebeeedc0d2abe9520aa53c09b80363e8966ee7f24430869)
+set(QT_HASH_qt5-webchannel          ef4040b63ad3cca80be38b8e3336ea0e70d1a57289ff2441c182f848b837d7ef87c78472f42f14cbc7a77f7ef5d5c50c0f5533071aaa13734832fdf6019c0253)
+set(QT_HASH_qt5-websockets          87d7cbce52562f6a5372106e46e15319d9647bab9ec5dbde132c017b9febbbc568ff2c182d3375165d87c1d4a88ae26d2e849baef53bce6e842d8d0d83f7ceb5)
+set(QT_HASH_qt5-webview             58356c59945fb075e17587b634156b66c5569cdbcf02ba91eb9fcc1146f1a4341e0d4d6afa0a70a6050070d35f156aa92a7aec0102aff0b862b5050533c55a5e)
+set(QT_HASH_qt5-winextras           ece6ad8cb8f43a8e43ed0f47323eb293d5c6329f32ccdd310ee3d3811006f81e63f8711e9c1a4630198087055fd6fb38012b4bcf0b008ac3d8da7eea6a461067)
+set(QT_HASH_qt5-xmlpatterns         180ccbab82b436702533ea7aaf445b399250555ed37eb3469889de64d13f218c0717489f270e29369119207441f85c05249923fe73daac5fcc2fdc7e970494c0)
 ##TODO
-set(QT_HASH_qt5-doc                 38277f3ec84754e564aac4fb3b495953d1a4ab823d7a4733633e14947e41af9d7b79af0d2812b9457fb3824c17a83c14df8d2b80420c6743d1806aa521e04cf4)
-set(QT_HASH_qt5-x11extras           cf30e66fda18b9bfd266b41f15713f7ca7390bc533fb8093096853f1554c2a91eb065dc17acb5b355b8fad08df3c695289d8c8081d568061c99659ec35d79b14)
-set(QT_HASH_qt5-androidextras       7355e8e049c739597b820c3dd96cdd48be7bed0becb171e1255c7caffd3a67aac349064da644ff3f3b11ebed31c26588d5db11fa5ffc743d7d010d1355eed26f)
-set(QT_HASH_qt5-canvas3d            0) # removed in latest
-set(QT_HASH_qt5-translations        38cedf19a1d7b920b7dcfcc014d3986c4067dafd7192efe43c3b8f282e0637391f9ec0b8cc7f5506cc76629d005298becba1421506b48c6baf3366ec2f378544)
-set(QT_HASH_qt5-serialbus           c98c7d30dc7f44837a601088b2797bc85d8b659dcdba5f22c229edad0fcee57e38c5b5d55ed223f22c9ce4e14b72ea6e59b920d4f4b366d0381b208e3e9cff40)
-set(QT_HASH_qt5-webengine           bcfd9ece04bdbfded5272ce1b3ab482e88349b1f5c5a071f58f6e66fcb9604d1fc38fe909ae3d9631bdf0bf7c081d7590620c3388f1a577b5236f68b084699bf)
-set(QT_HASH_qt5-webglplugin         02b059301527a3d943f842f3d076daba36470bee65c5888d1f896986f75556abb577bcfbf8337e4cf4fa1c6eb43e352430b1ea6ee1e02be826cd02b108915dc9)
-set(QT_HASH_qt5-wayland             0f396cabace17f099c2f2c0be54317006dc00c5f4be08cd79a4fa4fdc94362f63cc6ce9decc7feb63f566dd2ea52d562257e4bb23332557054418fc16dc7e899)
+set(QT_HASH_qt5-doc                 8842c7e2a5e8042b8c22f305a46d8191d7cfcccd4ead175431ed83b2fde707466ea1798f7819b56ab991af942cb94551d20eb2c13edbe9beaafb9e6bb86fba3e)
+set(QT_HASH_qt5-x11extras           12fc870f94e546d6e343f2ece44d09a6fc725b3ce092e1494bd2ef334ec92b559db2a8fcf6da88fe0f73040ee41fa5bf5f84ff197e5d1a004dabca3274508a96)
+set(QT_HASH_qt5-androidextras       d1b4a88053bd6b771f392e843611bf8397d782cc263ee924440e0ed6f63cdc936a2c127d3eb5a1834c11ef0c6efc2c8468fb65a28ec7f7645286bdea1dad590c)
+#set(QT_HASH_qt5-canvas3d            0) deprecated
+set(QT_HASH_qt5-translations        45302457e16e5dba674164dda7945110583f072d209d3984726324497efb367573475facc3534fd7cdfc61bc14295ebe4bf6588a37d45e87b676191d852f1c8a)
+set(QT_HASH_qt5-serialbus           8a606fd407cb7a4a6a1f15f10daec952aa010684d6cfca7fa024f850b3db419b7cd67eecb58ba0c0dd283e10fd904a255ab42b279c38081e84fe06b7b22c4c49)
+set(QT_HASH_qt5-webengine           11983470f0da9abfffba072406b2c67b475d8cf65412fdcfd925758e2a9449f509780e5b1001fb6868445c2c9540e5aa0e754954b70f1795b47335bad7c749b2)
+set(QT_HASH_qt5-webglplugin         cd8e63b8979601c3da37295148b7fe896863b97058d15fb9284a3eacca7fe62fae87dbd414285aee5df732ebadd67c96edd273ec9929ca005bf5282e4acb7cff)
+set(QT_HASH_qt5-wayland             e3d8fb79b7d3b10a94caccca1567c3a978b3517e13740aa6218d0a0b4cb180f6bdc3b533e113248908033f344ab5fcffd6fac751a1513c2d62834afe408ee714)
 
 if(QT_UPDATE_VERSION)
     message(STATUS "Running Qt in automatic version port update mode!")
diff --git a/ports/qt5-base/patches/8c44d70_latest.diff b/ports/qt5-base/patches/8c44d70.diff
similarity index 100%
rename from ports/qt5-base/patches/8c44d70_latest.diff
rename to ports/qt5-base/patches/8c44d70.diff
diff --git a/ports/qt5-base/patches/8c44d70_lts.diff b/ports/qt5-base/patches/8c44d70_lts.diff
deleted file mode 100644
index 567b79057..000000000
--- a/ports/qt5-base/patches/8c44d70_lts.diff
+++ /dev/null
@@ -1,28 +0,0 @@
-diff --git a/src/corelib/tools/qarraydata.cpp b/src/corelib/tools/qarraydata.cpp
-index 3879b48..c380893 100644
---- a/src/corelib/tools/qarraydata.cpp
-+++ b/src/corelib/tools/qarraydata.cpp
-@@ -46,19 +46,17 @@
- 
- QT_BEGIN_NAMESPACE
- 
--QT_WARNING_PUSH
--QT_WARNING_DISABLE_GCC("-Wmissing-field-initializers")
--
- const QArrayData QArrayData::shared_null[2] = {
-     { Q_REFCOUNT_INITIALIZE_STATIC, 0, 0, 0, sizeof(QArrayData) }, // shared null
--    /* zero initialized terminator */};
-+    { { Q_BASIC_ATOMIC_INITIALIZER(0) }, 0, 0, 0, 0 } /* zero initialized terminator */ 
-+    };
- 
- static const QArrayData qt_array[3] = {
-     { Q_REFCOUNT_INITIALIZE_STATIC, 0, 0, 0, sizeof(QArrayData) }, // shared empty
-     { { Q_BASIC_ATOMIC_INITIALIZER(0) }, 0, 0, 0, sizeof(QArrayData) }, // unsharable empty
--    /* zero initialized terminator */};
-+    { { Q_BASIC_ATOMIC_INITIALIZER(0) }, 0, 0, 0, 0 } /* zero initialized terminator */ 
-+    };
- 
--QT_WARNING_POP
- 
- static const QArrayData &qt_array_empty = qt_array[0];
- static const QArrayData &qt_array_unsharable_empty = qt_array[1];
diff --git a/ports/qt5-base/patches/Qt5BasicConfig.patch b/ports/qt5-base/patches/Qt5BasicConfig.patch
index 2055d3a3e..4f5d1fab0 100644
--- a/ports/qt5-base/patches/Qt5BasicConfig.patch
+++ b/ports/qt5-base/patches/Qt5BasicConfig.patch
@@ -2,12 +2,36 @@ diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/featu
 index c72989288..a88234dca 100644
 --- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
 +++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
-@@ -53,7 +53,11 @@ macro(_populate_$${CMAKE_MODULE_NAME}_target_properties Configuration LIB_LOCATI
+@@ -53,8 +53,12 @@ function(_qt5_$${CMAKE_MODULE_NAME}_process_prl_file prl_file_location Configura
+     set(_lib_deps)
+     set(_link_flags)
+ 
+-!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
+-    set(_qt5_install_libs \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}\")
++!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)    
++    if(\"${Configuration}\" STREQUAL \"DEBUG\")
++        set(_qt5_install_libs \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/debug/$${CMAKE_LIB_DIR}\")
++    else()
++        set(_qt5_install_libs \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}\")
++    endif()
+ !!ELSE
+     set(_qt5_install_libs \"$${CMAKE_LIB_DIR}\")
+ !!ENDIF
+@@ -125,6 +129,8 @@ function(_qt5_$${CMAKE_MODULE_NAME}_process_prl_file prl_file_location Configura
+             elseif(EXISTS \"${_flag}\")
+                 # The flag is an absolute path to an existing library
+                 list(APPEND _lib_deps \"${_flag}\")
++            elseif(_flag MATCHES \"\\\\.lib$\") #Library name only. No -l. Probably missing some cases
++                list(APPEND _lib_deps \"${_flag}\") 
+             elseif(_flag MATCHES \"^-L(.*)$\")
+                 # Handle -Lfoo flags by putting their paths in the search path used by find_library above
+                 list(APPEND _search_paths \"${CMAKE_MATCH_1}\")
+@@ -147,7 +153,11 @@ macro(_populate_$${CMAKE_MODULE_NAME}_target_properties Configuration LIB_LOCATI
      set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration})
  
  !!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE)
 -    set(imported_location \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_DLL_DIR}${LIB_LOCATION}\")
-+    if(\"${Configuration}\" STREQUAL \"DEBUG\")
++    if(\"${Configuration}\" STREQUAL \"DEBUG\") # 1
 +        set(imported_location \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/debug/$${CMAKE_DLL_DIR}${LIB_LOCATION}\")
 +    else()
 +        set(imported_location \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_DLL_DIR}${LIB_LOCATION}\")
@@ -15,9 +39,45 @@ index c72989288..a88234dca 100644
  !!ELSE
      set(imported_location \"$${CMAKE_DLL_DIR}${LIB_LOCATION}\")
  !!ENDIF
-@@ -69,8 +73,12 @@ macro(_populate_$${CMAKE_MODULE_NAME}_target_properties Configuration LIB_LOCATI
+@@ -174,21 +184,22 @@ macro(_populate_$${CMAKE_MODULE_NAME}_target_properties Configuration LIB_LOCATI
      )
  
+ !!IF !isEmpty(CMAKE_STATIC_TYPE)
+-    if(NOT "${IsDebugAndRelease}")
+-        set(_genex_condition \"1\")
++    #if(NOT "${IsDebugAndRelease}")
++    #    set(_genex_condition \"1\")
++    #else()
++    if("${Configuration}" STREQUAL "DEBUG")
++        set(_genex_condition \"$<CONFIG:Debug>\")
+     else()
+-        if("${Configuration}" STREQUAL "DEBUG")
+-            set(_genex_condition \"$<CONFIG:Debug>\")
+-        else()
+-            set(_genex_condition \"$<NOT:$<CONFIG:Debug>>\")
+-        endif()
++        set(_genex_condition \"$<NOT:$<CONFIG:Debug>>\")
+     endif()
++    #endif()
+ 
+     if(_static_deps)
+         set(_static_deps_genex \"$<${_genex_condition}:${_static_deps}>\")
+         set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} APPEND PROPERTY INTERFACE_LINK_LIBRARIES
+                      \"${_static_deps_genex}\"
+         )
++        #message(STATUS \"Target Qt5::$${CMAKE_MODULE_NAME} static links: ${_static_dep} through ${_static_dep_genex}\") # Added for debugging
+     endif()
+ 
+     set(_static_link_flags \"${_Qt5$${CMAKE_MODULE_NAME}_STATIC_${Configuration}_LINK_FLAGS}\")
+@@ -205,13 +216,18 @@ macro(_populate_$${CMAKE_MODULE_NAME}_target_properties Configuration LIB_LOCATI
+             set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} APPEND PROPERTY INTERFACE_LINK_LIBRARIES
+                 \"${_static_link_flags_genex}\"
+             )
++            #message(STATUS \"Target Qt5::$${CMAKE_MODULE_NAME} static link flags: ${_static_link_flags} through ${_static_link_flags_genex}\")
+         endif()
+     endif()
+ !!ENDIF
+ 
  !!IF !isEmpty(CMAKE_WINDOWS_BUILD)
  !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
 -    set(imported_implib \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\")
@@ -29,29 +89,58 @@ index c72989288..a88234dca 100644
  !!ELSE
      set(imported_implib \"IMPORTED_IMPLIB_${Configuration}\" \"$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\")
  !!ENDIF
-@@ -265,14 +265,19 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
- !!IF !isEmpty(CMAKE_RELEASE_TYPE)
- !!IF !isEmpty(CMAKE_STATIC_WINDOWS_BUILD)
-     _populate_$${CMAKE_MODULE_NAME}_target_properties(RELEASE \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" \"\" )
-+    if(EXISTS  \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/debug/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\")
-+        _populate_$${CMAKE_MODULE_NAME}_target_properties(DEBUG \"$${CMAKE_LIB_FILE_LOCATION_DEBUG}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" ) # X64/X86-WINDOWS-STATIC!
+@@ -373,13 +389,14 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+ 
+ !!IF !isEmpty(CMAKE_STATIC_TYPE)
+     if(NOT Qt5_EXCLUDE_STATIC_DEPENDENCIES)
+-!!IF !isEmpty(CMAKE_DEBUG_TYPE)
+ !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
++    if(EXISTS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/debug/$${CMAKE_LIB_DIR}$${CMAKE_PRL_FILE_LOCATION_DEBUG}\")
+         _qt5_$${CMAKE_MODULE_NAME}_process_prl_file(
+-            \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_PRL_FILE_LOCATION_DEBUG}\" DEBUG
++            \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/debug/$${CMAKE_LIB_DIR}$${CMAKE_PRL_FILE_LOCATION_DEBUG}\" DEBUG
+             _Qt5$${CMAKE_MODULE_NAME}_STATIC_DEBUG_LIB_DEPENDENCIES
+             _Qt5$${CMAKE_MODULE_NAME}_STATIC_DEBUG_LINK_FLAGS
+         )
 +    endif()
  !!ELSE
-     _populate_$${CMAKE_MODULE_NAME}_target_properties(RELEASE \"$${CMAKE_LIB_FILE_LOCATION_RELEASE}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" )
-+    if(EXISTS  \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/debug/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\")
-+        _populate_$${CMAKE_MODULE_NAME}_target_properties(DEBUG \"$${CMAKE_LIB_FILE_LOCATION_DEBUG}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" ) ## OSX! LINUX! X64/X86-WINDOWS!
-+    endif()
- !!ENDIF // CMAKE_STATIC_WINDOWS_BUILD
+         _qt5_$${CMAKE_MODULE_NAME}_process_prl_file(
+             \"$${CMAKE_LIB_DIR}$${CMAKE_PRL_FILE_LOCATION_DEBUG}\" DEBUG
+@@ -387,22 +404,21 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+             _Qt5$${CMAKE_MODULE_NAME}_STATIC_DEBUG_LINK_FLAGS
+         )
+ !!ENDIF
+-!!ENDIF
  
- !!IF !isEmpty(CMAKE_FIND_OTHER_LIBRARY_BUILD)
--!!IF isEmpty(CMAKE_DEBUG_TYPE)
+-!!IF !isEmpty(CMAKE_RELEASE_TYPE)
+ !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
++    if(EXISTS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_PRL_FILE_LOCATION_RELEASE}\")
+         _qt5_$${CMAKE_MODULE_NAME}_process_prl_file(
+             \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_PRL_FILE_LOCATION_RELEASE}\" RELEASE
+             _Qt5$${CMAKE_MODULE_NAME}_STATIC_RELEASE_LIB_DEPENDENCIES
+             _Qt5$${CMAKE_MODULE_NAME}_STATIC_RELEASE_LINK_FLAGS
+         )
++    endif()
+ !!ELSE
+         _qt5_$${CMAKE_MODULE_NAME}_process_prl_file(
+             \"$${CMAKE_LIB_DIR}$${CMAKE_PRL_FILE_LOCATION_RELEASE}\" RELEASE
+             _Qt5$${CMAKE_MODULE_NAME}_STATIC_RELEASE_LIB_DEPENDENCIES
+             _Qt5$${CMAKE_MODULE_NAME}_STATIC_RELEASE_LINK_FLAGS
+         )
+-!!ENDIF
+ !!ENDIF
+     endif()
+ 
+@@ -466,7 +482,7 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+ !!IF isEmpty(CMAKE_DEBUG_TYPE)
  !!IF !isEmpty(CMAKE_STATIC_WINDOWS_BUILD)
  !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
 -    if (EXISTS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" )
 +    if (EXISTS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/debug/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" )
  !!ELSE // CMAKE_LIB_DIR_IS_ABSOLUTE
      if (EXISTS \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" )
-@@ -281,20 +288,19 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+ !!ENDIF // CMAKE_LIB_DIR_IS_ABSOLUTE
+@@ -474,13 +490,13 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
  !!ELSE // CMAKE_STATIC_WINDOWS_BUILD
      if (EXISTS
  !!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE)
@@ -67,34 +156,39 @@ index c72989288..a88234dca 100644
  !!ELSE
          \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" )
  !!ENDIF
-         _populate_$${CMAKE_MODULE_NAME}_target_properties(DEBUG \"$${CMAKE_LIB_FILE_LOCATION_DEBUG}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" )
- !!ENDIF // CMAKE_STATIC_WINDOWS_BUILD
-     endif()
--!!ENDIF // CMAKE_DEBUG_TYPE
- !!ENDIF // CMAKE_FIND_OTHER_LIBRARY_BUILD
- 
- !!ENDIF // CMAKE_RELEASE_TYPE
-@@ -347,7 +353,12 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -543,7 +559,11 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
          set_property(TARGET Qt5::${Plugin} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration})
  
  !!IF isEmpty(CMAKE_PLUGIN_DIR_IS_ABSOLUTE)
-+    if(\"${Configuration}\" STREQUAL \"DEBUG\")
-+        set(imported_location \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/debug/$${CMAKE_PLUGIN_DIR}${PLUGIN_LOCATION}\")
-+    else()
-         set(imported_location \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_PLUGIN_DIR}${PLUGIN_LOCATION}\")
-+    endif()
-+
+-        set(imported_location \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_PLUGIN_DIR}${PLUGIN_LOCATION}\")
++        if(\"${Configuration}\" STREQUAL \"DEBUG\")
++            set(imported_location \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/debug/$${CMAKE_PLUGIN_DIR}${PLUGIN_LOCATION}\")
++        else()
++            set(imported_location \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_PLUGIN_DIR}${PLUGIN_LOCATION}\")
++        endif()
  !!ELSE
          set(imported_location \"$${CMAKE_PLUGIN_DIR}${PLUGIN_LOCATION}\")
  !!ENDIF
-@@ -482,6 +482,9 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
-         \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" )
- !!ENDIF
-         _populate_$${CMAKE_MODULE_NAME}_target_properties(RELEASE \"$${CMAKE_LIB_FILE_LOCATION_RELEASE}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" )
-+        if(EXISTS  \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/debug/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\")
-+            _populate_$${CMAKE_MODULE_NAME}_target_properties(DEBUG \"$${CMAKE_LIB_FILE_LOCATION_DEBUG}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" ) ### Never? Debug Config?
-+        endif()
- !!ENDIF // CMAKE_STATIC_WINDOWS_BUILD
-     endif()
- !!ENDIF // CMAKE_RELEASE_TYPE
- 
\ No newline at end of file
+@@ -557,15 +577,15 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+             ${_Qt5${Plugin}_STATIC_${Configuration}_LIB_DEPENDENCIES}
+         )
+ 
+-        if(NOT "${IsDebugAndRelease}")
+-            set(_genex_condition \"1\")
++        #if(NOT "${IsDebugAndRelease}")
++        #    set(_genex_condition \"1\")
++        #else()
++        if("${Configuration}" STREQUAL "DEBUG")
++            set(_genex_condition \"$<CONFIG:Debug>\")
+         else()
+-            if("${Configuration}" STREQUAL "DEBUG")
+-                set(_genex_condition \"$<CONFIG:Debug>\")
+-            else()
+-                set(_genex_condition \"$<NOT:$<CONFIG:Debug>>\")
+-            endif()
++            set(_genex_condition \"$<NOT:$<CONFIG:Debug>>\")
+         endif()
++        #endif()
+         if(_static_deps)
+             set(_static_deps_genex \"$<${_genex_condition}:${_static_deps}>\")
+             set_property(TARGET Qt5::${Plugin} APPEND PROPERTY INTERFACE_LINK_LIBRARIES
diff --git a/ports/qt5-base/patches/Qt5BasicConfig_latest.patch b/ports/qt5-base/patches/Qt5BasicConfig_latest.patch
deleted file mode 100644
index 4f5d1fab0..000000000
--- a/ports/qt5-base/patches/Qt5BasicConfig_latest.patch
+++ /dev/null
@@ -1,194 +0,0 @@
-diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
-index c72989288..a88234dca 100644
---- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
-+++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
-@@ -53,8 +53,12 @@ function(_qt5_$${CMAKE_MODULE_NAME}_process_prl_file prl_file_location Configura
-     set(_lib_deps)
-     set(_link_flags)
- 
--!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
--    set(_qt5_install_libs \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}\")
-+!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)    
-+    if(\"${Configuration}\" STREQUAL \"DEBUG\")
-+        set(_qt5_install_libs \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/debug/$${CMAKE_LIB_DIR}\")
-+    else()
-+        set(_qt5_install_libs \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}\")
-+    endif()
- !!ELSE
-     set(_qt5_install_libs \"$${CMAKE_LIB_DIR}\")
- !!ENDIF
-@@ -125,6 +129,8 @@ function(_qt5_$${CMAKE_MODULE_NAME}_process_prl_file prl_file_location Configura
-             elseif(EXISTS \"${_flag}\")
-                 # The flag is an absolute path to an existing library
-                 list(APPEND _lib_deps \"${_flag}\")
-+            elseif(_flag MATCHES \"\\\\.lib$\") #Library name only. No -l. Probably missing some cases
-+                list(APPEND _lib_deps \"${_flag}\") 
-             elseif(_flag MATCHES \"^-L(.*)$\")
-                 # Handle -Lfoo flags by putting their paths in the search path used by find_library above
-                 list(APPEND _search_paths \"${CMAKE_MATCH_1}\")
-@@ -147,7 +153,11 @@ macro(_populate_$${CMAKE_MODULE_NAME}_target_properties Configuration LIB_LOCATI
-     set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration})
- 
- !!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE)
--    set(imported_location \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_DLL_DIR}${LIB_LOCATION}\")
-+    if(\"${Configuration}\" STREQUAL \"DEBUG\") # 1
-+        set(imported_location \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/debug/$${CMAKE_DLL_DIR}${LIB_LOCATION}\")
-+    else()
-+        set(imported_location \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_DLL_DIR}${LIB_LOCATION}\")
-+    endif()
- !!ELSE
-     set(imported_location \"$${CMAKE_DLL_DIR}${LIB_LOCATION}\")
- !!ENDIF
-@@ -174,21 +184,22 @@ macro(_populate_$${CMAKE_MODULE_NAME}_target_properties Configuration LIB_LOCATI
-     )
- 
- !!IF !isEmpty(CMAKE_STATIC_TYPE)
--    if(NOT "${IsDebugAndRelease}")
--        set(_genex_condition \"1\")
-+    #if(NOT "${IsDebugAndRelease}")
-+    #    set(_genex_condition \"1\")
-+    #else()
-+    if("${Configuration}" STREQUAL "DEBUG")
-+        set(_genex_condition \"$<CONFIG:Debug>\")
-     else()
--        if("${Configuration}" STREQUAL "DEBUG")
--            set(_genex_condition \"$<CONFIG:Debug>\")
--        else()
--            set(_genex_condition \"$<NOT:$<CONFIG:Debug>>\")
--        endif()
-+        set(_genex_condition \"$<NOT:$<CONFIG:Debug>>\")
-     endif()
-+    #endif()
- 
-     if(_static_deps)
-         set(_static_deps_genex \"$<${_genex_condition}:${_static_deps}>\")
-         set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} APPEND PROPERTY INTERFACE_LINK_LIBRARIES
-                      \"${_static_deps_genex}\"
-         )
-+        #message(STATUS \"Target Qt5::$${CMAKE_MODULE_NAME} static links: ${_static_dep} through ${_static_dep_genex}\") # Added for debugging
-     endif()
- 
-     set(_static_link_flags \"${_Qt5$${CMAKE_MODULE_NAME}_STATIC_${Configuration}_LINK_FLAGS}\")
-@@ -205,13 +216,18 @@ macro(_populate_$${CMAKE_MODULE_NAME}_target_properties Configuration LIB_LOCATI
-             set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} APPEND PROPERTY INTERFACE_LINK_LIBRARIES
-                 \"${_static_link_flags_genex}\"
-             )
-+            #message(STATUS \"Target Qt5::$${CMAKE_MODULE_NAME} static link flags: ${_static_link_flags} through ${_static_link_flags_genex}\")
-         endif()
-     endif()
- !!ENDIF
- 
- !!IF !isEmpty(CMAKE_WINDOWS_BUILD)
- !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
--    set(imported_implib \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\")
-+    if(\"${Configuration}\" STREQUAL \"DEBUG\")
-+        set(imported_implib \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/debug/$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\")
-+    else()
-+        set(imported_implib \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\")
-+    endif()
- !!ELSE
-     set(imported_implib \"IMPORTED_IMPLIB_${Configuration}\" \"$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\")
- !!ENDIF
-@@ -373,13 +389,14 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
- 
- !!IF !isEmpty(CMAKE_STATIC_TYPE)
-     if(NOT Qt5_EXCLUDE_STATIC_DEPENDENCIES)
--!!IF !isEmpty(CMAKE_DEBUG_TYPE)
- !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
-+    if(EXISTS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/debug/$${CMAKE_LIB_DIR}$${CMAKE_PRL_FILE_LOCATION_DEBUG}\")
-         _qt5_$${CMAKE_MODULE_NAME}_process_prl_file(
--            \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_PRL_FILE_LOCATION_DEBUG}\" DEBUG
-+            \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/debug/$${CMAKE_LIB_DIR}$${CMAKE_PRL_FILE_LOCATION_DEBUG}\" DEBUG
-             _Qt5$${CMAKE_MODULE_NAME}_STATIC_DEBUG_LIB_DEPENDENCIES
-             _Qt5$${CMAKE_MODULE_NAME}_STATIC_DEBUG_LINK_FLAGS
-         )
-+    endif()
- !!ELSE
-         _qt5_$${CMAKE_MODULE_NAME}_process_prl_file(
-             \"$${CMAKE_LIB_DIR}$${CMAKE_PRL_FILE_LOCATION_DEBUG}\" DEBUG
-@@ -387,22 +404,21 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
-             _Qt5$${CMAKE_MODULE_NAME}_STATIC_DEBUG_LINK_FLAGS
-         )
- !!ENDIF
--!!ENDIF
- 
--!!IF !isEmpty(CMAKE_RELEASE_TYPE)
- !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
-+    if(EXISTS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_PRL_FILE_LOCATION_RELEASE}\")
-         _qt5_$${CMAKE_MODULE_NAME}_process_prl_file(
-             \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_PRL_FILE_LOCATION_RELEASE}\" RELEASE
-             _Qt5$${CMAKE_MODULE_NAME}_STATIC_RELEASE_LIB_DEPENDENCIES
-             _Qt5$${CMAKE_MODULE_NAME}_STATIC_RELEASE_LINK_FLAGS
-         )
-+    endif()
- !!ELSE
-         _qt5_$${CMAKE_MODULE_NAME}_process_prl_file(
-             \"$${CMAKE_LIB_DIR}$${CMAKE_PRL_FILE_LOCATION_RELEASE}\" RELEASE
-             _Qt5$${CMAKE_MODULE_NAME}_STATIC_RELEASE_LIB_DEPENDENCIES
-             _Qt5$${CMAKE_MODULE_NAME}_STATIC_RELEASE_LINK_FLAGS
-         )
--!!ENDIF
- !!ENDIF
-     endif()
- 
-@@ -466,7 +482,7 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
- !!IF isEmpty(CMAKE_DEBUG_TYPE)
- !!IF !isEmpty(CMAKE_STATIC_WINDOWS_BUILD)
- !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
--    if (EXISTS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" )
-+    if (EXISTS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/debug/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" )
- !!ELSE // CMAKE_LIB_DIR_IS_ABSOLUTE
-     if (EXISTS \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" )
- !!ENDIF // CMAKE_LIB_DIR_IS_ABSOLUTE
-@@ -474,13 +490,13 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
- !!ELSE // CMAKE_STATIC_WINDOWS_BUILD
-     if (EXISTS
- !!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE)
--        \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_DLL_DIR}$${CMAKE_LIB_FILE_LOCATION_DEBUG}\"
-+        \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/debug/$${CMAKE_DLL_DIR}$${CMAKE_LIB_FILE_LOCATION_DEBUG}\"
- !!ELSE
-         \"$${CMAKE_LIB_FILE_LOCATION_DEBUG}\"
- !!ENDIF
-       AND EXISTS
- !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
--        \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" )
-+        \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/debug/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" )
- !!ELSE
-         \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" )
- !!ENDIF
-@@ -543,7 +559,11 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
-         set_property(TARGET Qt5::${Plugin} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration})
- 
- !!IF isEmpty(CMAKE_PLUGIN_DIR_IS_ABSOLUTE)
--        set(imported_location \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_PLUGIN_DIR}${PLUGIN_LOCATION}\")
-+        if(\"${Configuration}\" STREQUAL \"DEBUG\")
-+            set(imported_location \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/debug/$${CMAKE_PLUGIN_DIR}${PLUGIN_LOCATION}\")
-+        else()
-+            set(imported_location \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_PLUGIN_DIR}${PLUGIN_LOCATION}\")
-+        endif()
- !!ELSE
-         set(imported_location \"$${CMAKE_PLUGIN_DIR}${PLUGIN_LOCATION}\")
- !!ENDIF
-@@ -557,15 +577,15 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
-             ${_Qt5${Plugin}_STATIC_${Configuration}_LIB_DEPENDENCIES}
-         )
- 
--        if(NOT "${IsDebugAndRelease}")
--            set(_genex_condition \"1\")
-+        #if(NOT "${IsDebugAndRelease}")
-+        #    set(_genex_condition \"1\")
-+        #else()
-+        if("${Configuration}" STREQUAL "DEBUG")
-+            set(_genex_condition \"$<CONFIG:Debug>\")
-         else()
--            if("${Configuration}" STREQUAL "DEBUG")
--                set(_genex_condition \"$<CONFIG:Debug>\")
--            else()
--                set(_genex_condition \"$<NOT:$<CONFIG:Debug>>\")
--            endif()
-+            set(_genex_condition \"$<NOT:$<CONFIG:Debug>>\")
-         endif()
-+        #endif()
-         if(_static_deps)
-             set(_static_deps_genex \"$<${_genex_condition}:${_static_deps}>\")
-             set_property(TARGET Qt5::${Plugin} APPEND PROPERTY INTERFACE_LINK_LIBRARIES
diff --git a/ports/qt5-base/patches/Qt5PluginTarget.patch b/ports/qt5-base/patches/Qt5PluginTarget.patch
index 0ae0a03c0..a8377b585 100644
--- a/ports/qt5-base/patches/Qt5PluginTarget.patch
+++ b/ports/qt5-base/patches/Qt5PluginTarget.patch
@@ -2,21 +2,73 @@ diff --git a/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in b/mkspecs/feat
 index 5baf0fdb1..185abfffd 100644
 --- a/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in
 +++ b/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in
-@@ -1,11 +1,11 @@
- 
- add_library(Qt5::$$CMAKE_PLUGIN_NAME MODULE IMPORTED)
+@@ -15,13 +15,14 @@ foreach(_module_dep ${_Qt5$${CMAKE_PLUGIN_NAME}_MODULE_DEPENDENCIES})
+     endif()
+ endforeach()
  
 -!!IF !isEmpty(CMAKE_RELEASE_TYPE)
--_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME RELEASE \"$${CMAKE_PLUGIN_LOCATION_RELEASE}\")
+ !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
+-_qt5_$${CMAKE_MODULE_NAME}_process_prl_file(
+-    \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_PLUGIN_DIR}$${CMAKE_PRL_FILE_LOCATION_RELEASE}\" RELEASE
+-    _Qt5$${CMAKE_PLUGIN_NAME}_STATIC_RELEASE_LIB_DEPENDENCIES
+-    _Qt5$${CMAKE_PLUGIN_NAME}_STATIC_RELEASE_LINK_FLAGS
+-)
++if(EXISTS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_PLUGIN_DIR}$${CMAKE_PRL_FILE_LOCATION_RELEASE}\")
++    _qt5_$${CMAKE_MODULE_NAME}_process_prl_file(
++        \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_PLUGIN_DIR}$${CMAKE_PRL_FILE_LOCATION_RELEASE}\" RELEASE
++        _Qt5$${CMAKE_PLUGIN_NAME}_STATIC_RELEASE_LIB_DEPENDENCIES
++        _Qt5$${CMAKE_PLUGIN_NAME}_STATIC_RELEASE_LINK_FLAGS
++    )
++endif()
+ !!ELSE
+ _qt5_$${CMAKE_MODULE_NAME}_process_prl_file(
+     \"$${CMAKE_PLUGIN_DIR}$${CMAKE_PRL_FILE_LOCATION_RELEASE}\" RELEASE
+@@ -29,15 +30,15 @@ _qt5_$${CMAKE_MODULE_NAME}_process_prl_file(
+     _Qt5$${CMAKE_PLUGIN_NAME}_STATIC_RELEASE_LINK_FLAGS
+ )
+ !!ENDIF
+-!!ENDIF
+ 
+-!!IF !isEmpty(CMAKE_DEBUG_TYPE)
+ !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
+-_qt5_$${CMAKE_MODULE_NAME}_process_prl_file(
+-    \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_PLUGIN_DIR}$${CMAKE_PRL_FILE_LOCATION_DEBUG}\" DEBUG
+-    _Qt5$${CMAKE_PLUGIN_NAME}_STATIC_DEBUG_LIB_DEPENDENCIES
+-    _Qt5$${CMAKE_PLUGIN_NAME}_STATIC_DEBUG_LINK_FLAGS
+-)
++if(EXISTS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/debug/$${CMAKE_PLUGIN_DIR}$${CMAKE_PRL_FILE_LOCATION_DEBUG}\")
++    _qt5_$${CMAKE_MODULE_NAME}_process_prl_file(
++        \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/debug/$${CMAKE_PLUGIN_DIR}$${CMAKE_PRL_FILE_LOCATION_DEBUG}\" DEBUG
++        _Qt5$${CMAKE_PLUGIN_NAME}_STATIC_DEBUG_LIB_DEPENDENCIES
++        _Qt5$${CMAKE_PLUGIN_NAME}_STATIC_DEBUG_LINK_FLAGS
++    )
++endif()
+ !!ELSE
+ _qt5_$${CMAKE_MODULE_NAME}_process_prl_file(
+     \"$${CMAKE_PLUGIN_DIR}$${CMAKE_PRL_FILE_LOCATION_DEBUG}\" DEBUG
+@@ -45,19 +46,18 @@ _qt5_$${CMAKE_MODULE_NAME}_process_prl_file(
+     _Qt5$${CMAKE_PLUGIN_NAME}_STATIC_DEBUG_LINK_FLAGS
+ )
+ !!ENDIF
+-!!ENDIF
+ 
+ set_property(TARGET Qt5::$$CMAKE_PLUGIN_NAME PROPERTY INTERFACE_SOURCES
+     \"${CMAKE_CURRENT_LIST_DIR}/Qt5$${CMAKE_MODULE_NAME}_$${CMAKE_PLUGIN_NAME}_Import.cpp\"
+ )
+ !!ENDIF
+ 
+-!!IF !isEmpty(CMAKE_RELEASE_TYPE)
+-_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME RELEASE \"$${CMAKE_PLUGIN_LOCATION_RELEASE}\" $${CMAKE_DEBUG_AND_RELEASE})
 -!!ENDIF
 -!!IF !isEmpty(CMAKE_DEBUG_TYPE)
--_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME DEBUG \"$${CMAKE_PLUGIN_LOCATION_DEBUG}\")
+-_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME DEBUG \"$${CMAKE_PLUGIN_LOCATION_DEBUG}\" $${CMAKE_DEBUG_AND_RELEASE})
 -!!ENDIF
 +if(EXISTS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_PLUGIN_DIR}$${CMAKE_PLUGIN_LOCATION_RELEASE}\")
-+    _populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME RELEASE \"$${CMAKE_PLUGIN_LOCATION_RELEASE}\")
++    _populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME RELEASE \"$${CMAKE_PLUGIN_LOCATION_RELEASE}\" $${CMAKE_DEBUG_AND_RELEASE})
 +endif()
 +if(EXISTS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/debug/$${CMAKE_PLUGIN_DIR}$${CMAKE_PLUGIN_LOCATION_DEBUG}\")
-+    _populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME DEBUG \"$${CMAKE_PLUGIN_LOCATION_DEBUG}\")
++    _populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME DEBUG \"$${CMAKE_PLUGIN_LOCATION_DEBUG}\" $${CMAKE_DEBUG_AND_RELEASE})
 +endif()
  
  list(APPEND Qt5$${CMAKE_MODULE_NAME}_PLUGINS Qt5::$$CMAKE_PLUGIN_NAME)
+ set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} APPEND PROPERTY QT_ALL_PLUGINS_$${CMAKE_PLUGIN_TYPE_ESCAPED} Qt5::$${CMAKE_PLUGIN_NAME})
diff --git a/ports/qt5-base/patches/Qt5PluginTarget_latest.patch b/ports/qt5-base/patches/Qt5PluginTarget_latest.patch
deleted file mode 100644
index a8377b585..000000000
--- a/ports/qt5-base/patches/Qt5PluginTarget_latest.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-diff --git a/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in b/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in
-index 5baf0fdb1..185abfffd 100644
---- a/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in
-+++ b/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in
-@@ -15,13 +15,14 @@ foreach(_module_dep ${_Qt5$${CMAKE_PLUGIN_NAME}_MODULE_DEPENDENCIES})
-     endif()
- endforeach()
- 
--!!IF !isEmpty(CMAKE_RELEASE_TYPE)
- !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
--_qt5_$${CMAKE_MODULE_NAME}_process_prl_file(
--    \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_PLUGIN_DIR}$${CMAKE_PRL_FILE_LOCATION_RELEASE}\" RELEASE
--    _Qt5$${CMAKE_PLUGIN_NAME}_STATIC_RELEASE_LIB_DEPENDENCIES
--    _Qt5$${CMAKE_PLUGIN_NAME}_STATIC_RELEASE_LINK_FLAGS
--)
-+if(EXISTS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_PLUGIN_DIR}$${CMAKE_PRL_FILE_LOCATION_RELEASE}\")
-+    _qt5_$${CMAKE_MODULE_NAME}_process_prl_file(
-+        \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_PLUGIN_DIR}$${CMAKE_PRL_FILE_LOCATION_RELEASE}\" RELEASE
-+        _Qt5$${CMAKE_PLUGIN_NAME}_STATIC_RELEASE_LIB_DEPENDENCIES
-+        _Qt5$${CMAKE_PLUGIN_NAME}_STATIC_RELEASE_LINK_FLAGS
-+    )
-+endif()
- !!ELSE
- _qt5_$${CMAKE_MODULE_NAME}_process_prl_file(
-     \"$${CMAKE_PLUGIN_DIR}$${CMAKE_PRL_FILE_LOCATION_RELEASE}\" RELEASE
-@@ -29,15 +30,15 @@ _qt5_$${CMAKE_MODULE_NAME}_process_prl_file(
-     _Qt5$${CMAKE_PLUGIN_NAME}_STATIC_RELEASE_LINK_FLAGS
- )
- !!ENDIF
--!!ENDIF
- 
--!!IF !isEmpty(CMAKE_DEBUG_TYPE)
- !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
--_qt5_$${CMAKE_MODULE_NAME}_process_prl_file(
--    \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_PLUGIN_DIR}$${CMAKE_PRL_FILE_LOCATION_DEBUG}\" DEBUG
--    _Qt5$${CMAKE_PLUGIN_NAME}_STATIC_DEBUG_LIB_DEPENDENCIES
--    _Qt5$${CMAKE_PLUGIN_NAME}_STATIC_DEBUG_LINK_FLAGS
--)
-+if(EXISTS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/debug/$${CMAKE_PLUGIN_DIR}$${CMAKE_PRL_FILE_LOCATION_DEBUG}\")
-+    _qt5_$${CMAKE_MODULE_NAME}_process_prl_file(
-+        \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/debug/$${CMAKE_PLUGIN_DIR}$${CMAKE_PRL_FILE_LOCATION_DEBUG}\" DEBUG
-+        _Qt5$${CMAKE_PLUGIN_NAME}_STATIC_DEBUG_LIB_DEPENDENCIES
-+        _Qt5$${CMAKE_PLUGIN_NAME}_STATIC_DEBUG_LINK_FLAGS
-+    )
-+endif()
- !!ELSE
- _qt5_$${CMAKE_MODULE_NAME}_process_prl_file(
-     \"$${CMAKE_PLUGIN_DIR}$${CMAKE_PRL_FILE_LOCATION_DEBUG}\" DEBUG
-@@ -45,19 +46,18 @@ _qt5_$${CMAKE_MODULE_NAME}_process_prl_file(
-     _Qt5$${CMAKE_PLUGIN_NAME}_STATIC_DEBUG_LINK_FLAGS
- )
- !!ENDIF
--!!ENDIF
- 
- set_property(TARGET Qt5::$$CMAKE_PLUGIN_NAME PROPERTY INTERFACE_SOURCES
-     \"${CMAKE_CURRENT_LIST_DIR}/Qt5$${CMAKE_MODULE_NAME}_$${CMAKE_PLUGIN_NAME}_Import.cpp\"
- )
- !!ENDIF
- 
--!!IF !isEmpty(CMAKE_RELEASE_TYPE)
--_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME RELEASE \"$${CMAKE_PLUGIN_LOCATION_RELEASE}\" $${CMAKE_DEBUG_AND_RELEASE})
--!!ENDIF
--!!IF !isEmpty(CMAKE_DEBUG_TYPE)
--_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME DEBUG \"$${CMAKE_PLUGIN_LOCATION_DEBUG}\" $${CMAKE_DEBUG_AND_RELEASE})
--!!ENDIF
-+if(EXISTS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_PLUGIN_DIR}$${CMAKE_PLUGIN_LOCATION_RELEASE}\")
-+    _populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME RELEASE \"$${CMAKE_PLUGIN_LOCATION_RELEASE}\" $${CMAKE_DEBUG_AND_RELEASE})
-+endif()
-+if(EXISTS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/debug/$${CMAKE_PLUGIN_DIR}$${CMAKE_PLUGIN_LOCATION_DEBUG}\")
-+    _populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME DEBUG \"$${CMAKE_PLUGIN_LOCATION_DEBUG}\" $${CMAKE_DEBUG_AND_RELEASE})
-+endif()
- 
- list(APPEND Qt5$${CMAKE_MODULE_NAME}_PLUGINS Qt5::$$CMAKE_PLUGIN_NAME)
- set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} APPEND PROPERTY QT_ALL_PLUGINS_$${CMAKE_PLUGIN_TYPE_ESCAPED} Qt5::$${CMAKE_PLUGIN_NAME})
diff --git a/ports/qt5-base/patches/create_cmake.patch b/ports/qt5-base/patches/create_cmake.patch
index aecde6ff4..69bd39a2a 100644
--- a/ports/qt5-base/patches/create_cmake.patch
+++ b/ports/qt5-base/patches/create_cmake.patch
@@ -14,8 +14,8 @@ index 4aa5dad46..cee6d2882 100644
  
          isEmpty(CMAKE_STATIC_TYPE) {
              CMAKE_PLUGIN_LOCATION_RELEASE = $$PLUGIN_TYPE/$${CMAKE_QT_STEM}.dll
-@@ -294,6 +294,7 @@ CMAKE_INTERFACE_QT5_MODULE_DEPS = $$join(aux_lib_deps, ";")
- CMAKE_MODULE_PLUGIN_TYPES = $$join(QT.$${MODULE}.plugin_types, ";")
+@@ -295,6 +295,7 @@ CMAKE_INTERFACE_QT5_MODULE_DEPS = $$join(aux_lib_deps, ";")
+ equals(TEMPLATE, aux): CMAKE_FEATURE_PROPERTY_PREFIX = "INTERFACE_"
  
  mac {
 +    CMAKE_FIND_OTHER_LIBRARY_BUILD = "true"
@@ -31,7 +31,7 @@ index 4aa5dad46..cee6d2882 100644
  
      CMAKE_LIB_FILE_LOCATION_DEBUG = $${CMAKE_QT_STEM}$${debug_suffix}.dll
      CMAKE_LIB_FILE_LOCATION_RELEASE = $${CMAKE_QT_STEM}.dll
-@@ -340,6 +340,7 @@ mac {
+@@ -342,6 +342,7 @@ mac {
          CMAKE_IMPLIB_FILE_LOCATION_RELEASE = $${CMAKE_QT_STEM}.lib
      }
  } else {
diff --git a/ports/qt5-base/patches/egl.patch b/ports/qt5-base/patches/egl.patch
new file mode 100644
index 000000000..17f0a55de
--- /dev/null
+++ b/ports/qt5-base/patches/egl.patch
@@ -0,0 +1,16 @@
+diff --git a/src/gui/configure.json b/src/gui/configure.json
+index 5fceb1150..7702cb261 100644
+--- a/src/gui/configure.json	
++++ b/src/gui/configure.json
+@@ -220,7 +220,10 @@
+             "headers": "EGL/egl.h",
+             "sources": [
+                 { "type": "pkgConfig", "args": "egl" },
+-                { "type": "makeSpec", "spec": "EGL" }
++                { "type": "makeSpec", "spec": "EGL" },
++                { "libs": "-lEGL -lGLESv2 -lGL -lANGLE -lGL -lX11 -ldl -lm -lpthread" },
++                { "libs": "-DGL_GLES_PROTOTYPES=1 -DGL_GLEXT_PROTOTYPES -DEGL_EGL_PROTOTYPES=1 -DEGL_EGLEXT_PROTOTYPES -lEGL -lGLESv2 -lGL -lANGLE -lGL -lX11 -ldl -lm -lpthread" },
++                { "libs": "-DANGLE_EXPORT -DANGLE_UTIL_EXPORT -DGL_API -DGL_APICALL -DEGLAPI -DGL_GLES_PROTOTYPES=1 -DGL_GLEXT_PROTOTYPES -DEGL_EGL_PROTOTYPES=1 -DEGL_EGLEXT_PROTOTYPES -lEGL -lGLESv2 -lGL -lANGLE -lGL -lX11 -ldl -lm -lpthread" }
+             ]
+         },
+         "freetype": {
diff --git a/ports/qt5-base/patches/prl_parser.patch b/ports/qt5-base/patches/prl_parser.patch
deleted file mode 100644
index ccd8ec8b9..000000000
--- a/ports/qt5-base/patches/prl_parser.patch
+++ /dev/null
@@ -1,260 +0,0 @@
-diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
-index 81db0d92c..51016f3fa 100644
---- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
-+++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
-@@ -1,6 +1,6 @@
- 
--if (CMAKE_VERSION VERSION_LESS 3.1.0)
--    message(FATAL_ERROR \"Qt 5 $${CMAKE_MODULE_NAME} module requires at least CMake version 3.1.0\")
-+if (CMAKE_VERSION VERSION_LESS 3.6.0) # Increase for cmake_parse_arguments
-+    message(FATAL_ERROR \"Qt 5 $${CMAKE_MODULE_NAME} module requires at least CMake version 3.6.0\")
- endif()
- 
- !!IF !isEmpty(CMAKE_USR_MOVE_WORKAROUND)
-@@ -34,6 +34,167 @@ set(Qt5$${CMAKE_MODULE_NAME}_VERSION_STRING "$$eval(QT.$${MODULE}.VERSION)")
- set(Qt5$${CMAKE_MODULE_NAME}_LIBRARIES Qt5::$${CMAKE_MODULE_NAME})
- !!ENDIF // TEMPLATE != aux
- 
-+###### Added by VCPKG
-+function(_qt5_$${CMAKE_MODULE_NAME}_parse_prl)
-+    cmake_parse_arguments(_qt_prl \"\" \"CONFIGURATION;TARGET;PRL_FILE;LIB_FILE;OUT_DEPS;OUT_FLAGS\" \"\" ${ARGN})
-+    if(NOT _qt_prl_CONFIGURATION)
-+         message(FATAL_ERROR \"qt_parse_prl requires parameter CONFIGURATION\")
-+    endif()
-+    if(NOT _qt_prl_TARGET)
-+         message(FATAL_ERROR \"qt_parse_prl requires parameter TARGET\")
-+    endif()
-+    if(NOT _qt_prl_PRL_FILE AND NOT _qt_prl_LIB_FILE)
-+         message(FATAL_ERROR \"qt_parse_prl requires parameter PRL_FILE or LIB_FILE\")
-+    endif()
-+    if(NOT _qt_prl_OUT_DEPS)
-+         message(FATAL_ERROR \"qt_parse_prl requires parameter OUT_DEPS\")
-+    endif()
-+    if(NOT _qt_prl_OUT_FLAGS)
-+         message(FATAL_ERROR \"qt_parse_prl requires parameter OUT_FLAGS\")
-+    endif()
-+
-+    if(_qt_prl_LIB_FILE)
-+         set(_parsed_prl \"${_qt_prl_LIB_FILE}\")
-+         string(REGEX REPLACE \"${CMAKE_STATIC_LIBRARY_SUFFIX}$\" \".prl\" _parsed_prl \"${_parsed_prl}\")
-+    else()
-+         set(_parsed_prl \"${_qt_prl_PRL_FILE}\")
-+    endif()
-+
-+    #message(STATUS \"Reading file: ${_parsed_prl}\")
-+    if(NOT EXISTS \"${_parsed_prl}\")
-+         message(FATAL_ERROR \"Could not find PRL file: ${_parsed_prl}\")
-+    endif()
-+    file(STRINGS \"${_parsed_prl}\" _static_depends REGEX \"^QMAKE_PRL_LIBS[ \\t]+=[ \\t]+.+$\")
-+    #message(STATUS \"QMAKE_PRL_LIBS from ${_parsed_prl} as read : ${_static_depends}\n\n\")
-+    string(REGEX REPLACE \"QMAKE_PRL_LIBS[ \\t]+=[ \\t]+\" \"\" _static_depends \"${_static_depends}\")
-+    string(REGEX REPLACE \" -L\\\\$\\\\$([^ ]+)\" [[ ;-L\$\$\\1; ]] _static_depends \"${_static_depends}\") # - L Normal Case
-+    if(WIN32)
-+         string(REGEX REPLACE \"-L\\\\\\\"([^\\\\\\\"]+)\\\\\\\"\" \" ;-L\\\"\\\\1\\\"; \" _static_depends \"${_static_depends}\") # -L Tricky Case with spaces
-+         string(REGEX REPLACE [[\\\"?[A-Z]:\\\\\\\\Program Files( \\(x86\\))*\\\\\\\\Windows Kits\\\\\\\\[0-9]+\\\\\\\\lib\\\\\\\\[0-9|.]+\\\\\\\\um\\\\\\\\x64(\\\\\\\\|/)([^\\\"]+)\\\"?]] \";\\\\3;\" _static_depends \"${_static_depends}\")
-+         string(REGEX REPLACE [[ \\\"([^\\"]+)\\\" ]] \" ;\\\"\\\\1\\\"; \" _static_depends \"${_static_depends}\") 
-+         # Every path with a space in it should be handled now!
-+    else()
-+         string(REGEX REPLACE \" -l([^ ]+)\" [[;-l\\1;]] _static_depends \"${_static_depends}\") # - l case on targets other than windows
-+    endif()
-+    string(REGEX REPLACE \"[\\t ]+[^\\\\\\\"]([^( |\\\\\\\")]+)[^\\\\\\\"]([\\t ]+|[\\t ]*$)\" \";\\\\0; \" _static_depends \"${_static_depends}\")
-+    string(REGEX REPLACE \"[\\t ]*;[\\t ]*\" \";\" _static_depends \"${_static_depends}\")      # remove unnecessary whitespaces 
-+    string(REGEX REPLACE \"(;[\\t ]*;)+\" \";\" _static_depends \"${_static_depends}\")    # remove empty elements from the list
-+    #string(REGEX REPLACE \" [\\"]\" \";\\\\\\\"\" _static_depends \"${_static_depends}\")
-+    #message(STATUS \"QMAKE_PRL_LIBS as a list : ${_static_depends}\n\n\")
-+
-+    #Logic Backported from Qt 5.14
-+    set(_search_paths)
-+    set(_fw_search_paths)
-+    set(_framework_flag)
-+    if(\"${_qt_prl_CONFIGURATION}\" STREQUAL \"DEBUG\")
-+        set(_prl_location \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/debug/$${CMAKE_LIB_DIR}${LIB_LOCATION}\")
-+    else()
-+        set(_prl_location \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}${LIB_LOCATION}\")
-+    endif()
-+    string(REPLACE \"\$\$[QT_INSTALL_LIBS]/\" \"${_prl_location}\" _static_depends \"${_static_depends}\")
-+    string(REGEX REPLACE \"[ \t]+\" \";\" _standard_libraries \"${CMAKE_CXX_STANDARD_LIBRARIES}\")
-+    foreach(_flag IN LISTS _static_depends)
-+        if(_flag MATCHES \"^-framework$\")
-+           # Handle the next flag as framework name
-+           set(_framework_flag 1)
-+        elseif(_flag MATCHES \"^-F(.*)$\")
-+           # Handle -F/foo/bar flags by recording the framework search paths to be used
-+           # by find_library.
-+           list(APPEND _fw_search_paths \"${CMAKE_MATCH_1}\")
-+        elseif(_framework_flag OR _flag MATCHES \"^-l(.*)$\")
-+          if(_framework_flag)
-+            # Handle Darwin framework bundles passed as -framework Foo
-+            unset(_framework_flag)
-+            set(_lib ${_flag})
-+          else()
-+            # Handle normal libraries passed as -lfoo
-+            set(_lib \"${CMAKE_MATCH_1}\")
-+            foreach(_standard_library ${_standard_libraries})
-+              if(_standard_library MATCHES \"^${_lib}(\\\\.lib)?$\")
-+                 set(_lib_is_default_linked TRUE)
-+                 break()
-+              endif()
-+            endforeach()
-+          endif()
-+          if (_lib_is_default_linked)
-+              unset(_lib_is_default_linked)
-+          elseif(_lib MATCHES \"^pthread$\")
-+              find_package(Threads REQUIRED)
-+              list(APPEND _lib_deps Threads::Threads)
-+          else()
-+              set(current_search_paths \"${_search_paths}\")
-+              if(_framework_flag)
-+                  set(current_search_paths \"${_fw_search_paths}\")
-+              endif()
-+              if(current_search_paths)
-+                  find_library(_Qt5$${CMAKE_MODULE_NAME}_${Configuration}_${_lib}_PATH ${_lib} HINTS ${current_search_paths} NO_DEFAULT_PATH)
-+              endif()
-+              find_library(_Qt5$${CMAKE_MODULE_NAME}_${Configuration}_${_lib}_PATH ${_lib})
-+              mark_as_advanced(_Qt5$${CMAKE_MODULE_NAME}_${Configuration}_${_lib}_PATH)
-+              if(_Qt5$${CMAKE_MODULE_NAME}_${Configuration}_${_lib}_PATH)
-+                  list(APPEND _lib_deps
-+                      ${_Qt5$${CMAKE_MODULE_NAME}_${Configuration}_${_lib}_PATH}
-+                  )
-+              else()
-+                  message(FATAL_ERROR \"Library not found: ${_lib}\")
-+              endif()
-+              unset(_framework_flag)
-+          endif()
-+      elseif(EXISTS \"${_flag}\")
-+          # The flag is an absolute path to an existing library
-+          list(APPEND _lib_deps \"${_flag}\")
-+      elseif(_flag MATCHES \"^-L(.*)$\")
-+          # Handle -Lfoo flags by putting their paths in the search path used by find_library above
-+          list(APPEND _search_paths \"${CMAKE_MATCH_1}\")
-+      elseif(_flag MATCHES \"\\\.(lib|a|so)$\") #Library name only. No -l. Probably missing some cases
-+          #message(STATUS \"Added to link deps (${Configuration}): ${_flag}\")
-+          list(APPEND _lib_deps ${_flag}) # changed from _link_flags
-+      else()
-+          # Handle all remaining flags by simply passing them to the linker
-+          #message(STATUS \"Added to link flags (${Configuration}): ${_flag}\")
-+          list(APPEND _lib_flags ${_flag}) # changed from _link_flags
-+      endif()
-+    endforeach()
-+    
-+    #message(STATUS \"${_qt_prl_TARGET} links (via PRL ${_qt_prl_CONFIGURATION}): ${_lib_deps}\")
-+    #message(STATUS \"${_qt_prl_TARGET} has linker flags (via PRL): ${_lib_flags}\")
-+    #get_target_property(_test_interface ${_qt_prl_TARGET} INTERFACE_LINK_LIBRARIES)
-+    #message(STATUS \"INTERFACE_LINK_LIBRARIES of target before ${_qt_prl_TARGET}: ${_test_interface} \")
-+    set(_prl_out_libs)
-+    foreach(_prl_lib IN LISTS _lib_deps)
-+        if(\"${_qt_prl_CONFIGURATION}\" STREQUAL \"DEBUG\")
-+            #message(STATUS \"DEBUG: ${_prl_lib}\")
-+            #set_property(TARGET ${_qt_prl_TARGET} APPEND PROPERTY INTERFACE_LINK_LIBRARIES \"\\$<\\$<CONFIG:DEBUG>:${_prl_lib}>\")
-+            list(APPEND _prl_out_libs \"\\$<\\$<CONFIG:DEBUG>:${_prl_lib}>\")
-+        else()
-+            #message(STATUS \"RELEASE: ${_prl_lib}\")
-+            #set_property(TARGET ${_qt_prl_TARGET} APPEND PROPERTY INTERFACE_LINK_LIBRARIES \"\\$<\\$<NOT:\\$<CONFIG:DEBUG>>:${_prl_lib}>\")
-+            list(APPEND _prl_out_libs \"\\$<\\$<NOT:\\$<CONFIG:DEBUG>>:${_prl_lib}>\")
-+        endif()
-+    endforeach()
-+    set(${_qt_prl_OUT_DEPS} "${_prl_out_libs}" PARENT_SCOPE)
-+    unset(_prl_lib)
-+    
-+    set(_prl_out_flags)
-+    foreach(_prl_flag IN LISTS _lib_flags)
-+        if(\"${_qt_prl_CONFIGURATION}\" STREQUAL \"DEBUG\")
-+            #set_property(TARGET ${_qt_prl_TARGET} APPEND PROPERTY INTERFACE_LINK_LIBRARIES \"\\$<\\$<CONFIG:DEBUG>:${_prl_flag}>\")
-+            list(APPEND _prl_out_flags \"\\$<\\$<CONFIG:DEBUG>:${_prl_flag}>\")
-+        else()
-+            #set_property(TARGET ${_qt_prl_TARGET} APPEND PROPERTY INTERFACE_LINK_LIBRARIES \"\\$<\\$<NOT:\\$<CONFIG:DEBUG>>:${_prl_flag}>\")
-+            list(APPEND _prl_out_flags \"\\$<\\$<NOT:\\$<CONFIG:DEBUG>>:${_prl_flag}>\")
-+        endif()
-+    endforeach()
-+    set(${_qt_prl_OUT_FLAGS} "${_prl_out_flags}" PARENT_SCOPE)
-+    unset(_prl_flag)
-+    
-+    #get_target_property(_test_interface ${_qt_prl_TARGET} INTERFACE_LINK_LIBRARIES)
-+    #message(STATUS \"INTERFACE_LINK_LIBRARIES of target after ${_qt_prl_TARGET}: ${_test_interface} \")
-+endfunction()
-+
-+###### END Added by VCPKG 
-+
-+
- macro(_qt5_$${CMAKE_MODULE_NAME}_check_file_exists file)
-     if(NOT EXISTS \"${file}\" )
-         message(FATAL_ERROR \"The imported target \\\"Qt5::$${CMAKE_MODULE_NAME}\\\" references the file
-@@ -52,6 +189,24 @@ endmacro()
- macro(_populate_$${CMAKE_MODULE_NAME}_target_properties Configuration LIB_LOCATION IMPLIB_LOCATION)
-     set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration})
- 
-+!!IF !isEmpty(CMAKE_WINDOWS_BUILD)
-+!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
-+    if(\"${Configuration}\" STREQUAL \"DEBUG\")
-+        set(imported_implib \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/debug/$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\")
-+    else()
-+        set(imported_implib \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\")
-+    endif()
-+!!ELSE
-+    set(imported_implib \"IMPORTED_IMPLIB_${Configuration}\" \"$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\")
-+!!ENDIF
-+    _qt5_$${CMAKE_MODULE_NAME}_check_file_exists(${imported_implib})
-+    if(NOT \"${IMPLIB_LOCATION}\" STREQUAL \"\")
-+        set_target_properties(Qt5::$${CMAKE_MODULE_NAME} PROPERTIES
-+        \"IMPORTED_IMPLIB_${Configuration}\" ${imported_implib}
-+        )
-+    endif()
-+!!ENDIF
-+
- !!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE)
-     if(\"${Configuration}\" STREQUAL \"DEBUG\")
-         set(imported_location \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/debug/$${CMAKE_DLL_DIR}${LIB_LOCATION}\")
-@@ -60,35 +215,24 @@ macro(_populate_$${CMAKE_MODULE_NAME}_target_properties Configuration LIB_LOCATI
-     endif()
- !!ELSE
-     set(imported_location \"$${CMAKE_DLL_DIR}${LIB_LOCATION}\")
-+!!ENDIF
-+!!IF !isEmpty(CMAKE_STATIC_TYPE)
-+    _qt5_$${CMAKE_MODULE_NAME}_parse_prl(TARGET Qt5::$${CMAKE_MODULE_NAME} LIB_FILE \"${imported_location}\" CONFIGURATION \"${Configuration}\" OUT_DEPS PRL_DEPS OUT_FLAGS PRL_FLAGS)
-+!!ELSE
-+    _qt5_$${CMAKE_MODULE_NAME}_parse_prl(TARGET Qt5::$${CMAKE_MODULE_NAME} LIB_FILE \"${imported_implib}\" CONFIGURATION \"${Configuration}\" OUT_DEPS PRL_DEPS OUT_FLAGS PRL_FLAGS)
- !!ENDIF
-     _qt5_$${CMAKE_MODULE_NAME}_check_file_exists(${imported_location})
-+    set_property(TARGET ${_qt_prl_TARGET} APPEND PROPERTY INTERFACE_LINK_LIBRARIES \"${_Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES};${PRL_DEPS};${PRL_FLAGS}\")
-     set_target_properties(Qt5::$${CMAKE_MODULE_NAME} PROPERTIES
--        \"INTERFACE_LINK_LIBRARIES\" \"${_Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES}\"
-+        #\"INTERFACE_LINK_LIBRARIES\" \"${_Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES};${PRL_DEPS};${PRL_FLAGS}\"
-         \"IMPORTED_LOCATION_${Configuration}\" ${imported_location}
- !!IF !isEmpty(CMAKE_LIB_SONAME)
-         \"IMPORTED_SONAME_${Configuration}\" \"$${CMAKE_LIB_SONAME}\"
- !!ENDIF
-         # For backward compatibility with CMake < 2.8.12
--        \"IMPORTED_LINK_INTERFACE_LIBRARIES_${Configuration}\" \"${_Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES}\"
-+        \"IMPORTED_LINK_INTERFACE_LIBRARIES_${Configuration}\" \"${_Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES};${PRL_DEPS};${PRL_FLAGS}\"
-     )
- 
--!!IF !isEmpty(CMAKE_WINDOWS_BUILD)
--!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
--    if(\"${Configuration}\" STREQUAL \"DEBUG\")
--        set(imported_implib \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/debug/$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\")
--    else()
--        set(imported_implib \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\")
--    endif()
--!!ELSE
--    set(imported_implib \"IMPORTED_IMPLIB_${Configuration}\" \"$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\")
--!!ENDIF
--    _qt5_$${CMAKE_MODULE_NAME}_check_file_exists(${imported_implib})
--    if(NOT \"${IMPLIB_LOCATION}\" STREQUAL \"\")
--        set_target_properties(Qt5::$${CMAKE_MODULE_NAME} PROPERTIES
--        \"IMPORTED_IMPLIB_${Configuration}\" ${imported_implib}
--        )
--    endif()
--!!ENDIF
- endmacro()
- !!ENDIF
- 
-@@ -366,6 +510,8 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
-         set_target_properties(Qt5::${Plugin} PROPERTIES
-             \"IMPORTED_LOCATION_${Configuration}\" ${imported_location}
-         )
-+        _qt5_$${CMAKE_MODULE_NAME}_parse_prl(TARGET Qt5::${Plugin} LIB_FILE \"${imported_location}\" CONFIGURATION \"${Configuration}\" OUT_DEPS PRL_DEPS OUT_FLAGS PRL_FLAGS)
-+        set_property(TARGET Qt5::${Plugin} APPEND PROPERTY INTERFACE_LINK_LIBRARIES \"${PRL_DEPS};${PRL_FLAGS}\")
-     endmacro()
- 
-     if (pluginTargets)
-
diff --git a/ports/qt5-base/patches/qt_moc.patch b/ports/qt5-base/patches/qt_moc.patch
deleted file mode 100644
index 08fdb1ac2..000000000
--- a/ports/qt5-base/patches/qt_moc.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git a/src/corelib/Qt5CoreMacros.cmake b/src/corelib/Qt5CoreMacros.cmake
-index 7735e51..b3da640 100644 (file)
---- a/src/corelib/Qt5CoreMacros.cmake
-+++ b/src/corelib/Qt5CoreMacros.cmake
-@@ -59,7 +59,14 @@ macro(QT5_MAKE_OUTPUT_FILE infile prefix ext outfile )
-     set(_outfile "${CMAKE_CURRENT_BINARY_DIR}/${rel}")
-     string(REPLACE ".." "__" _outfile ${_outfile})
-     get_filename_component(outpath ${_outfile} PATH)
--    string(REGEX REPLACE "\\.[^.]*$" "" _outfile ${_outfile})
-+    if(CMAKE_VERSION VERSION_LESS "3.14")
-+        get_filename_component(_outfile_ext ${_outfile} EXT)
-+        get_filename_component(_outfile_ext ${_outfile_ext} NAME_WE)
-+        get_filename_component(_outfile ${_outfile} NAME_WE)
-+        string(APPEND _outfile ${_outfile_ext})
-+    else()
-+        get_filename_component(_outfile ${_outfile} NAME_WLE)
-+    endif()
-     file(MAKE_DIRECTORY ${outpath})
-     set(${outfile} ${outpath}/${prefix}${_outfile}.${ext})
- endmacro()
diff --git a/ports/qt5-base/patches/xlib.patch b/ports/qt5-base/patches/xlib.patch
index 9c572e5f0..07cba5b82 100644
--- a/ports/qt5-base/patches/xlib.patch
+++ b/ports/qt5-base/patches/xlib.patch
@@ -16,8 +16,8 @@ index 9a749516b..242f47504 100644
 @@ -590,6 +592,7 @@
              "headers": "xcb/xcb.h",
              "sources": [
-                 { "type": "pkgConfig", "args": "xcb >= 1.9" },
-+                { "type": "pkgConfig", "args": "xcb >= 1.9 --static" },
+                 { "type": "pkgConfig", "args": "xcb >= 1.11" },
++                { "type": "pkgConfig", "args": "xcb >= 1.11 --static" },
                  "-lxcb"
              ]
          },
@@ -32,8 +32,8 @@ index 9a749516b..242f47504 100644
 @@ -711,6 +715,7 @@
              "headers": "xcb/xkb.h",
              "sources": [
-                 { "type": "pkgConfig", "args": "xcb-xkb >= 1.10" },
-+                { "type": "pkgConfig", "args": "xcb-xkb >= 1.10 --static" },
+                 { "type": "pkgConfig", "args": "xcb-xkb" },
++                { "type": "pkgConfig", "args": "xcb-xkb --static" },
                  "-lxcb-xkb"
              ],
              "use": "xcb"
diff --git a/ports/qt5-base/portfile.cmake b/ports/qt5-base/portfile.cmake
index 5de6b37d0..f98992673 100644
--- a/ports/qt5-base/portfile.cmake
+++ b/ports/qt5-base/portfile.cmake
@@ -8,25 +8,25 @@ endif()
 
 if (VCPKG_TARGET_IS_LINUX)
     message(WARNING "${PORT} currently requires the following libraries from the system package manager:\n    libx11-xcb-dev\n\nThese can be installed on Ubuntu systems via apt-get install libx11-xcb-dev.")
+    message(WARNING "${PORT} for qt5-x11extras requires the following libraries from the system package manager:\n    libxkbcommon-x11-dev\n\nThese can be installed on Ubuntu systems via apt-get install libxkbcommon-x11-dev.")
+    #
 endif()
 
 list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR})
 list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/cmake)
 
-if("latest" IN_LIST FEATURES)
+if("latest" IN_LIST FEATURES) # latest = core currently
     set(QT_BUILD_LATEST ON)
     set(PATCHES 
-        patches/Qt5BasicConfig_latest.patch
-        patches/Qt5PluginTarget_latest.patch
+        patches/Qt5BasicConfig.patch
+        patches/Qt5PluginTarget.patch
         patches/create_cmake.patch
-        patches/8c44d70_latest.diff        # Fix for MSVC static init fiasco. 
         )
 else()
     set(PATCHES 
         patches/Qt5BasicConfig.patch
         patches/Qt5PluginTarget.patch
-        patches/prl_parser.patch # Modified backport of the prl parser from Qt5.14.1 without using QMAKE_PRL_LIBS_FOR_CMAKE
-        patches/8c44d70_lts.diff        # Fix for MSVC static init fiasco. 
+        patches/create_cmake.patch
     )
 endif()
 
@@ -52,12 +52,14 @@ endif()
 
 qt_download_submodule(  OUT_SOURCE_PATH SOURCE_PATH
                         PATCHES
-                            patches/winmain_pro.patch   #Moves qtmain to manual-link
-                            patches/windows_prf.patch   #fixes the qtmain dependency due to the above move
-                            patches/qt_app.patch        #Moves the target location of qt5 host apps to always install into the host dir. 
-                            patches/gui_configure.patch #Patches the gui configure.json to break freetype/fontconfig autodetection because it does not include its dependencies.
-                            patches/icu.patch           #Help configure find static icu builds in vcpkg on windows
-                            patches/xlib.patch          #Patches Xlib check to actually use Pkgconfig instead of makeSpec only
+                            patches/winmain_pro.patch    #Moves qtmain to manual-link
+                            patches/windows_prf.patch    #fixes the qtmain dependency due to the above move
+                            patches/qt_app.patch         #Moves the target location of qt5 host apps to always install into the host dir. 
+                            patches/gui_configure.patch  #Patches the gui configure.json to break freetype/fontconfig autodetection because it does not include its dependencies.
+                            patches/icu.patch            #Help configure find static icu builds in vcpkg on windows
+                            patches/xlib.patch           #Patches Xlib check to actually use Pkgconfig instead of makeSpec only
+                            patches/egl.patch            #Fix egl detection logic. 
+                            patches/8c44d70.diff         #Upstream fix for MSVC 16.6.2. static init of std::atomic. 
                             #patches/static_opengl.patch #Use this patch if you really want to statically link angle on windows (e.g. using -opengl es2 and -static). 
                                                          #Be carefull since it requires definining _GDI32_ for all dependent projects due to redefinition errors in the 
                                                          #the windows supplied gl.h header and the angle gl.h otherwise. 
@@ -221,7 +223,7 @@ if(VCPKG_TARGET_IS_WINDOWS)
             "OPENSSL_LIBS=${SSL_DEBUG} ${EAY_DEBUG} ws2_32.lib secur32.lib advapi32.lib shell32.lib crypt32.lib user32.lib gdi32.lib"
         )
 elseif(VCPKG_TARGET_IS_LINUX)
-    list(APPEND CORE_OPTIONS -fontconfig -xcb-xlib -linuxfb) #-system-xcb
+    list(APPEND CORE_OPTIONS -fontconfig -xcb-xlib -xcb -linuxfb)
     if (NOT EXISTS "/usr/include/GL/glu.h")
         message(FATAL_ERROR "qt5 requires libgl1-mesa-dev and libglu1-mesa-dev, please use your distribution's package manager to install them.\nExample: \"apt-get install libgl1-mesa-dev libglu1-mesa-dev\"")
     endif()
diff --git a/ports/qt5-canvas3d/CONTROL b/ports/qt5-canvas3d/CONTROL
index 4ff840207..2da0b4737 100644
--- a/ports/qt5-canvas3d/CONTROL
+++ b/ports/qt5-canvas3d/CONTROL
@@ -1,4 +1,4 @@
 Source: qt5-canvas3d
-Version: 5.12.8
+Version: 0
 Description: Qt5 Canvas 3d Module; 
-Build-Depends:  qt5-base
+Build-Depends: qt5-base[core]
diff --git a/ports/qt5-canvas3d/portfile.cmake b/ports/qt5-canvas3d/portfile.cmake
index d473c5625..14a8cbdb2 100644
--- a/ports/qt5-canvas3d/portfile.cmake
+++ b/ports/qt5-canvas3d/portfile.cmake
@@ -1,3 +1,4 @@
-set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled)
-include(${CURRENT_INSTALLED_DIR}/share/qt5/qt_port_functions.cmake)
-qt_submodule_installation()
\ No newline at end of file
+message(FATAL_ERROR "${PORT} has been deprecated and will be removed in the future from VCPKG")
+#set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled)
+#include(${CURRENT_INSTALLED_DIR}/share/qt5/qt_port_functions.cmake)
+#qt_submodule_installation()
\ No newline at end of file
diff --git a/ports/qt5-charts/CONTROL b/ports/qt5-charts/CONTROL
index 7f7fdac54..6e3ab6231 100644
--- a/ports/qt5-charts/CONTROL
+++ b/ports/qt5-charts/CONTROL
@@ -1,4 +1,4 @@
 Source: qt5-charts
-Version: 5.12.8
+Version: 5.15.0
 Description: Qt5 Charts Module - UI components for displaying charts, driven by static or dynamic data models
-Build-Depends:  qt5-base, qt5-declarative, qt5-multimedia
+Build-Depends:  qt5-base[core], qt5-declarative, qt5-multimedia
diff --git a/ports/qt5-connectivity/CONTROL b/ports/qt5-connectivity/CONTROL
index 5342f6c1e..7ffc9959c 100644
--- a/ports/qt5-connectivity/CONTROL
+++ b/ports/qt5-connectivity/CONTROL
@@ -1,4 +1,4 @@
 Source: qt5-connectivity
-Version: 5.12.8
+Version: 5.15.0
 Description: Qt5 Connectivity module - Provides access to Bluetooth and NFC hardware
-Build-Depends:  qt5-base
+Build-Depends:  qt5-base[core]
diff --git a/ports/qt5-datavis3d/CONTROL b/ports/qt5-datavis3d/CONTROL
index d7f3f2641..9d05c6962 100644
--- a/ports/qt5-datavis3d/CONTROL
+++ b/ports/qt5-datavis3d/CONTROL
@@ -1,4 +1,4 @@
 Source: qt5-datavis3d
-Version: 5.12.8
+Version: 5.15.0
 Description: Qt5 Data Visualization 3d Module - UI Components for creating 3D data visualizations
-Build-Depends:  qt5-base, qt5-declarative, qt5-multimedia
+Build-Depends:  qt5-base[core], qt5-declarative, qt5-multimedia
diff --git a/ports/qt5-declarative/CONTROL b/ports/qt5-declarative/CONTROL
index fae5018d7..37b14ecf3 100644
--- a/ports/qt5-declarative/CONTROL
+++ b/ports/qt5-declarative/CONTROL
@@ -1,4 +1,4 @@
 Source: qt5-declarative
-Version: 5.12.8
+Version: 5.15.0
 Description: Qt5 Declarative (Quick 2) Module. Includes QtQuick, QtQuickParticles, QtQuickWidgets, QtQml, and QtPacketProtocol.
-Build-Depends:  qt5-base, qt5-imageformats, qt5-svg
+Build-Depends:  qt5-base[core], qt5-imageformats, qt5-svg
diff --git a/ports/qt5-doc/CONTROL b/ports/qt5-doc/CONTROL
index 9b33d418c..6637877d4 100644
--- a/ports/qt5-doc/CONTROL
+++ b/ports/qt5-doc/CONTROL
@@ -1,5 +1,5 @@
 Source: qt5-doc
-Version: 5.12.8
+Version: 5.15.0
 Description: Qt5 doc Module; 
-Build-Depends:  qt5-base, qt5-declarative, qt5-quickcontrols2, qt5-tools
+Build-Depends:  qt5-base[core], qt5-declarative, qt5-quickcontrols2, qt5-tools
 Supports: linux
\ No newline at end of file
diff --git a/ports/qt5-gamepad/CONTROL b/ports/qt5-gamepad/CONTROL
index 80071773d..cc844b30a 100644
--- a/ports/qt5-gamepad/CONTROL
+++ b/ports/qt5-gamepad/CONTROL
@@ -1,4 +1,4 @@
 Source: qt5-gamepad
-Version: 5.12.8
+Version: 5.15.0
 Description: Qt5 Gamepad Module - Enables Qt applications to support the use of gamepad hardware
-Build-Depends:  qt5-base, qt5-declarative
+Build-Depends:  qt5-base[core], qt5-declarative
diff --git a/ports/qt5-graphicaleffects/CONTROL b/ports/qt5-graphicaleffects/CONTROL
index a3eb91046..931312361 100644
--- a/ports/qt5-graphicaleffects/CONTROL
+++ b/ports/qt5-graphicaleffects/CONTROL
@@ -1,4 +1,4 @@
 Source: qt5-graphicaleffects
-Version: 5.12.8
+Version: 5.15.0
 Description: Qt5 GraphicalEffects Module.
-Build-Depends:  qt5-base, qt5-declarative
+Build-Depends:  qt5-base[core], qt5-declarative
diff --git a/ports/qt5-imageformats/CONTROL b/ports/qt5-imageformats/CONTROL
index 0d7b14b2d..277ba3c0c 100644
--- a/ports/qt5-imageformats/CONTROL
+++ b/ports/qt5-imageformats/CONTROL
@@ -1,4 +1,4 @@
 Source: qt5-imageformats
-Version: 5.12.8
+Version: 5.15.0
 Description: Qt5 Image Formats Module - Plugins for additional image formats: TIFF, MNG, TGA, WBMP
-Build-Depends:  qt5-base, tiff, libwebp, jasper
+Build-Depends:  qt5-base[core], tiff, libwebp, jasper
diff --git a/ports/qt5-location/CONTROL b/ports/qt5-location/CONTROL
index 885b5482c..ecc878edf 100644
--- a/ports/qt5-location/CONTROL
+++ b/ports/qt5-location/CONTROL
@@ -1,4 +1,4 @@
 Source: qt5-location
-Version: 5.12.8
+Version: 5.15.0
 Description: Qt5 Location Module - Displays map, navigation, and place content in a QML application.
-Build-Depends: qt5-base, qt5-declarative, qt5-quickcontrols, qt5-quickcontrols2, qt5-serialport
+Build-Depends: qt5-base[core], qt5-declarative, qt5-quickcontrols, qt5-quickcontrols2, qt5-serialport
diff --git a/ports/qt5-location/portfile.cmake b/ports/qt5-location/portfile.cmake
index f49813c33..e96fab831 100644
--- a/ports/qt5-location/portfile.cmake
+++ b/ports/qt5-location/portfile.cmake
@@ -1,2 +1,3 @@
+message(STATUS "${PORT} has a spurious failure in which it is unable to create a parent directory! Just retry.")
 include(${CURRENT_INSTALLED_DIR}/share/qt5/qt_port_functions.cmake)
 qt_submodule_installation(PATCHES clipper.patch)
\ No newline at end of file
diff --git a/ports/qt5-macextras/CONTROL b/ports/qt5-macextras/CONTROL
index 36e7ada1f..1d7b4b278 100644
--- a/ports/qt5-macextras/CONTROL
+++ b/ports/qt5-macextras/CONTROL
@@ -1,5 +1,5 @@
 Source: qt5-macextras
-Version: 5.12.8
+Version: 5.15.0
 Description: Qt5 Mac Extras Module. Provides platform-specific APIs for mac.
-Build-Depends:  qt5-base
+Build-Depends:  qt5-base[core]
 Supports: osx
\ No newline at end of file
diff --git a/ports/qt5-macextras/portfile.cmake b/ports/qt5-macextras/portfile.cmake
index 9af7a2aac..cc2391d87 100644
--- a/ports/qt5-macextras/portfile.cmake
+++ b/ports/qt5-macextras/portfile.cmake
@@ -1,5 +1,5 @@
-if (NOT VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Darwin")
+include(${CURRENT_INSTALLED_DIR}/share/qt5/qt_port_functions.cmake)
+if (NOT VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Darwin" AND NOT QT_UPDATE_VERSION)
     message(FATAL_ERROR "qt5-macextras only support OSX.")
 endif()
-include(${CURRENT_INSTALLED_DIR}/share/qt5/qt_port_functions.cmake)
 qt_submodule_installation()
\ No newline at end of file
diff --git a/ports/qt5-mqtt/CONTROL b/ports/qt5-mqtt/CONTROL
index 9279c5c46..c61bb4adb 100644
--- a/ports/qt5-mqtt/CONTROL
+++ b/ports/qt5-mqtt/CONTROL
@@ -1,4 +1,4 @@
 Source: qt5-mqtt
-Version: 5.12.8
+Version: 5.15.0
 Description: Qt5 MQTT module.
-Build-Depends:  qt5-base
+Build-Depends:  qt5-base[core]
diff --git a/ports/qt5-mqtt/portfile.cmake b/ports/qt5-mqtt/portfile.cmake
index 069860e21..571496ff6 100644
--- a/ports/qt5-mqtt/portfile.cmake
+++ b/ports/qt5-mqtt/portfile.cmake
@@ -1,6 +1,8 @@
 include(${CURRENT_INSTALLED_DIR}/share/qt5/qt_port_functions.cmake)
 #qt_submodule_installation() No binary package for this port. 
-
+if(QT_UPDATE_VERSION)
+    set(QT_HASH_qt5-mqtt 1) # TO get an SHA512 error if the variable is set. 
+endif()
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO qt/qtmqtt
diff --git a/ports/qt5-multimedia/CONTROL b/ports/qt5-multimedia/CONTROL
index 10b5336b6..be36efe0c 100644
--- a/ports/qt5-multimedia/CONTROL
+++ b/ports/qt5-multimedia/CONTROL
@@ -1,4 +1,4 @@
 Source: qt5-multimedia
-Version: 5.12.8
+Version: 5.15.0
 Description: Qt5 Multimedia Module - Classes and widgets for audio, video, radio and camera functionality
-Build-Depends: qt5-base, qt5-declarative
+Build-Depends: qt5-base[core], qt5-declarative
diff --git a/ports/qt5-networkauth/CONTROL b/ports/qt5-networkauth/CONTROL
index 979e233ff..c97103fda 100644
--- a/ports/qt5-networkauth/CONTROL
+++ b/ports/qt5-networkauth/CONTROL
@@ -1,4 +1,4 @@
 Source: qt5-networkauth
-Version: 5.12.8
+Version: 5.15.0
 Description: Qt5 Network Authorization Module
-Build-Depends:  qt5-base
+Build-Depends:  qt5-base[core]
diff --git a/ports/qt5-purchasing/CONTROL b/ports/qt5-purchasing/CONTROL
index 99eea1c61..e7e82d57b 100644
--- a/ports/qt5-purchasing/CONTROL
+++ b/ports/qt5-purchasing/CONTROL
@@ -1,4 +1,4 @@
 Source: qt5-purchasing
-Version: 5.12.8
+Version: 5.15.0
 Description: Qt5 Purchasing Module - Enables in-app purchase of products in Qt applications.
-Build-Depends:  qt5-base, qt5-declarative
+Build-Depends:  qt5-base[core], qt5-declarative
diff --git a/ports/qt5-quickcontrols/CONTROL b/ports/qt5-quickcontrols/CONTROL
index 5f72aa306..39ba15ca0 100644
--- a/ports/qt5-quickcontrols/CONTROL
+++ b/ports/qt5-quickcontrols/CONTROL
@@ -1,4 +1,4 @@
 Source: qt5-quickcontrols
-Version: 5.12.8
+Version: 5.15.0
 Description: Qt5 QuickControls Module.
-Build-Depends:  qt5-base, qt5-declarative, qt5-graphicaleffects
+Build-Depends:  qt5-base[core], qt5-declarative, qt5-graphicaleffects
diff --git a/ports/qt5-quickcontrols2/CONTROL b/ports/qt5-quickcontrols2/CONTROL
index d0e8a25da..96a371edd 100644
--- a/ports/qt5-quickcontrols2/CONTROL
+++ b/ports/qt5-quickcontrols2/CONTROL
@@ -1,4 +1,4 @@
 Source: qt5-quickcontrols2
-Version: 5.12.8
+Version: 5.15.0
 Description: Qt5 QuickControls2 Module.
-Build-Depends:  qt5-base, qt5-declarative, qt5-imageformats
+Build-Depends:  qt5-base[core], qt5-declarative, qt5-imageformats
diff --git a/ports/qt5-remoteobjects/CONTROL b/ports/qt5-remoteobjects/CONTROL
index 2442cf005..bd7596dad 100644
--- a/ports/qt5-remoteobjects/CONTROL
+++ b/ports/qt5-remoteobjects/CONTROL
@@ -1,4 +1,4 @@
 Source: qt5-remoteobjects
-Version: 5.12.8
+Version: 5.15.0
 Description: Qt5 Remoteobjects module - Provides an easy to use mechanism for sharing a QObject's API (Properties/Signals/Slots) between processes or devices.
-Build-Depends:  qt5-base, qt5-declarative
+Build-Depends:  qt5-base[core], qt5-declarative
diff --git a/ports/qt5-script/CONTROL b/ports/qt5-script/CONTROL
index 407d80628..318c6af7d 100644
--- a/ports/qt5-script/CONTROL
+++ b/ports/qt5-script/CONTROL
@@ -1,4 +1,4 @@
 Source: qt5-script
-Version: 5.12.8
-Build-Depends: qt5-base, qt5-tools
+Version: 5.15.0
+Build-Depends: qt5-base[core], qt5-tools
 Description:Qt5 Script Module.
diff --git a/ports/qt5-scxml/CONTROL b/ports/qt5-scxml/CONTROL
index 5798b1c7d..89c4fecae 100644
--- a/ports/qt5-scxml/CONTROL
+++ b/ports/qt5-scxml/CONTROL
@@ -1,4 +1,4 @@
 Source: qt5-scxml
-Version: 5.12.8
+Version: 5.15.0
 Description: Qt5 SCXML Module - Provides classes and tools for creating state machines from SCXML files and embedding them in applications
-Build-Depends:  qt5-base, qt5-declarative
+Build-Depends:  qt5-base[core], qt5-declarative
diff --git a/ports/qt5-sensors/CONTROL b/ports/qt5-sensors/CONTROL
index 45f3ecc65..c9238cdb7 100644
--- a/ports/qt5-sensors/CONTROL
+++ b/ports/qt5-sensors/CONTROL
@@ -1,4 +1,4 @@
 Source: qt5-sensors
-Version: 5.12.8
+Version: 5.15.0
 Description: Qt5 Sensors module - Provides access to sensor hardware and motion gesture recognition.
-Build-Depends:  qt5-base, qt5-declarative
+Build-Depends:  qt5-base[core], qt5-declarative
diff --git a/ports/qt5-serialbus/CONTROL b/ports/qt5-serialbus/CONTROL
index c1346236f..3fb0e6eb3 100644
--- a/ports/qt5-serialbus/CONTROL
+++ b/ports/qt5-serialbus/CONTROL
@@ -1,4 +1,4 @@
 Source: qt5-serialbus
-Version: 5.12.8
+Version: 5.15.0
 Description: Qt5 Serialbus Module; 
-Build-Depends:  qt5-base, qt5-serialport
+Build-Depends: qt5-base[core], qt5-serialport
diff --git a/ports/qt5-serialport/CONTROL b/ports/qt5-serialport/CONTROL
index f10a49229..59f2351ec 100644
--- a/ports/qt5-serialport/CONTROL
+++ b/ports/qt5-serialport/CONTROL
@@ -1,4 +1,4 @@
 Source: qt5-serialport
-Version: 5.12.8
+Version: 5.15.0
 Description: Qt5 Serial Port - provides access to hardware and virtual serial ports
-Build-Depends:  qt5-base
+Build-Depends:  qt5-base[core]
diff --git a/ports/qt5-speech/CONTROL b/ports/qt5-speech/CONTROL
index 5322bd9fa..68cf863a3 100644
--- a/ports/qt5-speech/CONTROL
+++ b/ports/qt5-speech/CONTROL
@@ -1,4 +1,4 @@
 Source: qt5-speech
-Version: 5.12.8
+Version: 5.15.0
 Description: Qt5 Speech Module
-Build-Depends:  qt5-base, atlmfc (windows), qt5-declarative, qt5-multimedia
+Build-Depends:  qt5-base[core], atlmfc (windows), qt5-declarative, qt5-multimedia
diff --git a/ports/qt5-svg/CONTROL b/ports/qt5-svg/CONTROL
index 6496f405b..e51ed4e28 100644
--- a/ports/qt5-svg/CONTROL
+++ b/ports/qt5-svg/CONTROL
@@ -1,4 +1,4 @@
 Source: qt5-svg
-Version: 5.12.8
+Version: 5.15.0
 Description: Qt5 SVG Module - provides classes for displaying the contents of SVG files
-Build-Depends:  qt5-base
+Build-Depends:  qt5-base[core]
diff --git a/ports/qt5-tools/CONTROL b/ports/qt5-tools/CONTROL
index 0b11fe62a..032db26c0 100644
--- a/ports/qt5-tools/CONTROL
+++ b/ports/qt5-tools/CONTROL
@@ -1,4 +1,4 @@
 Source: qt5-tools
-Version: 5.12.8
+Version: 5.15.0
 Description: Qt5 Tools Module; Includes deployment tools and helpers, Qt Designer, Assistant, and other applications
-Build-Depends:  qt5-base, qt5-declarative, qt5-activeqt (windows)
+Build-Depends:  qt5-base[core], qt5-declarative, qt5-activeqt (windows)
diff --git a/ports/qt5-translations/CONTROL b/ports/qt5-translations/CONTROL
index fb441d9d2..4df742042 100644
--- a/ports/qt5-translations/CONTROL
+++ b/ports/qt5-translations/CONTROL
@@ -1,4 +1,4 @@
 Source: qt5-translations
-Version: 5.12.8
+Version: 5.15.0
 Description: Qt5 translations module
-Build-Depends:  qt5-base, qt5-tools
+Build-Depends:  qt5-base[core], qt5-tools
diff --git a/ports/qt5-virtualkeyboard/CONTROL b/ports/qt5-virtualkeyboard/CONTROL
index 1edcc2e6d..2a535313f 100644
--- a/ports/qt5-virtualkeyboard/CONTROL
+++ b/ports/qt5-virtualkeyboard/CONTROL
@@ -1,4 +1,4 @@
 Source: qt5-virtualkeyboard
-Version: 5.12.8
+Version: 5.15.0
 Description: Qt5 Virtual Keyboard Module - A framework for implementing different input methods. Supports localized keyboard layouts and custom visual themes
 Build-Depends:  qt5-svg, qt5-quickcontrols, qt5-multimedia, qt5-quickcontrols
diff --git a/ports/qt5-wayland/CONTROL b/ports/qt5-wayland/CONTROL
index a50560192..0063cacf0 100644
--- a/ports/qt5-wayland/CONTROL
+++ b/ports/qt5-wayland/CONTROL
@@ -1,4 +1,4 @@
 Source: qt5-wayland
-Version: 5.12.8
+Version: 5.15.0
 Description: Qt5 wayland Module; 
-Build-Depends:  qt5-base
+Build-Depends: qt5-base[core]
diff --git a/ports/qt5-webchannel/CONTROL b/ports/qt5-webchannel/CONTROL
index caa607bb2..ee2bbd2da 100644
--- a/ports/qt5-webchannel/CONTROL
+++ b/ports/qt5-webchannel/CONTROL
@@ -1,4 +1,4 @@
 Source: qt5-webchannel
-Version: 5.12.8
+Version: 5.15.0
 Description: Qt5 Web Channel module - Provides access to QObject or QML objects from HTML clients for seamless integration of Qt applications with HTML/JavaScript clients.
-Build-Depends:  qt5-base, qt5-declarative
+Build-Depends:  qt5-base[core], qt5-declarative
diff --git a/ports/qt5-webengine/CONTROL b/ports/qt5-webengine/CONTROL
index d4a334946..8dc1dc5a9 100644
--- a/ports/qt5-webengine/CONTROL
+++ b/ports/qt5-webengine/CONTROL
@@ -1,5 +1,5 @@
 Source: qt5-webengine
-Version: 5.12.8
+Version: 5.15.0
 Description: Qt5 webengine Module; 
-Build-Depends:  qt5-base, qt5-declarative, qt5-location, qt5-quickcontrols, qt5-quickcontrols2, qt5-tools, qt5-webchannel, atlmfc (windows), ffmpeg[core] (!windows)
+Build-Depends:  qt5-base[core], qt5-declarative, qt5-location, qt5-quickcontrols, qt5-quickcontrols2, qt5-tools, qt5-webchannel, atlmfc (windows), ffmpeg[core] (!windows)
 Supports: !static
diff --git a/ports/qt5-webengine/build.patch b/ports/qt5-webengine/build.patch
new file mode 100644
index 000000000..ec13b2d14
--- /dev/null
+++ b/ports/qt5-webengine/build.patch
@@ -0,0 +1,12 @@
+diff --git a/src/3rdparty/chromium/net/cert/x509_certificate_net_log_param.h b/src/3rdparty/chromium/net/cert/x509_certificate_net_log_param.h
+index 22dd9cc14..910149936 100644
+--- a/src/3rdparty/chromium/net/cert/x509_certificate_net_log_param.h	
++++ b/src/3rdparty/chromium/net/cert/x509_certificate_net_log_param.h
+@@ -6,6 +6,7 @@
+ #define NET_CERT_X509_CERTIFICATE_NET_LOG_PARAM_H_
+ 
+ #include <memory>
++#include <string>
+ 
+ #include "net/base/net_export.h"
+ 
diff --git a/ports/qt5-webengine/common.pri.latest.patch b/ports/qt5-webengine/common.pri.latest.patch
deleted file mode 100644
index ad58ab9e1..000000000
--- a/ports/qt5-webengine/common.pri.latest.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/src/buildtools/config/common.pri b/src/buildtools/config/common.pri
-#latest diff --git a/src/buildtools/config/common.pri b/src/buildtools/config/common.pri
-index 97d39535c..dc09da43a 100644
---- a/src/buildtools/config/common.pri	
-+++ b/src/buildtools/config/common.pri
-@@ -57,5 +57,5 @@
- precompile_header {
--    gn_args += enable_precompiled_headers=true
-+    gn_args += enable_precompiled_headers=false
- } else {
-     gn_args += enable_precompiled_headers=false
- }
diff --git a/ports/qt5-webengine/common.pri.patch b/ports/qt5-webengine/common.pri.patch
index 0af081035..ad58ab9e1 100644
--- a/ports/qt5-webengine/common.pri.patch
+++ b/ports/qt5-webengine/common.pri.patch
@@ -1,8 +1,8 @@
-diff --git a/src/core/config/common.pri b/src/core/config/common.pri
+diff --git a/src/buildtools/config/common.pri b/src/buildtools/config/common.pri
 #latest diff --git a/src/buildtools/config/common.pri b/src/buildtools/config/common.pri
 index 97d39535c..dc09da43a 100644
---- a/src/core/config/common.pri	
-+++ b/src/core/config/common.pri
+--- a/src/buildtools/config/common.pri	
++++ b/src/buildtools/config/common.pri
 @@ -57,5 +57,5 @@
  precompile_header {
 -    gn_args += enable_precompiled_headers=true
diff --git a/ports/qt5-webengine/gl.latest.patch b/ports/qt5-webengine/gl.latest.patch
deleted file mode 100644
index a48ddf6c3..000000000
--- a/ports/qt5-webengine/gl.latest.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/3rdparty/chromium/ui/gl/gl_bindings_autogen_gl.h b/src/3rdparty/chromium/ui/gl/gl_bindings_autogen_gl.h
-index d54583e8b..1921185f8 100644
---- a/src/3rdparty/chromium/ui/gl/gl_bindings_autogen_gl.h	
-+++ b/src/3rdparty/chromium/ui/gl/gl_bindings_autogen_gl.h
-@@ -16,7 +16,7 @@
- namespace gl {
- 
- class GLContext;
--
-+typedef void *GLeglImageOES;
- typedef void(GL_BINDING_CALL* glActiveShaderProgramProc)(GLuint pipeline,
-                                                          GLuint program);
- typedef void(GL_BINDING_CALL* glActiveTextureProc)(GLenum texture);
diff --git a/ports/qt5-webengine/gl.patch b/ports/qt5-webengine/gl.patch
index e581113e0..a48ddf6c3 100644
--- a/ports/qt5-webengine/gl.patch
+++ b/ports/qt5-webengine/gl.patch
@@ -8,6 +8,6 @@ index d54583e8b..1921185f8 100644
  class GLContext;
 -
 +typedef void *GLeglImageOES;
+ typedef void(GL_BINDING_CALL* glActiveShaderProgramProc)(GLuint pipeline,
+                                                          GLuint program);
  typedef void(GL_BINDING_CALL* glActiveTextureProc)(GLenum texture);
- typedef void(GL_BINDING_CALL* glApplyFramebufferAttachmentCMAAINTELProc)(void);
- typedef void(GL_BINDING_CALL* glAttachShaderProc)(GLuint program,
diff --git a/ports/qt5-webengine/portfile.cmake b/ports/qt5-webengine/portfile.cmake
index 27e4f8e2d..9da6797ca 100644
--- a/ports/qt5-webengine/portfile.cmake
+++ b/ports/qt5-webengine/portfile.cmake
@@ -38,11 +38,7 @@ vcpkg_add_to_path(PREPEND "${PYTHON2_DIR}")
 vcpkg_add_to_path(PREPEND "${GPERF_DIR}")
 vcpkg_add_to_path(PREPEND "${NINJA_DIR}")
 
-if(QT_MAJOR_MINOR_VER STREQUAL "5.14")
-    set(PATCHES common.pri.latest.patch gl.latest.patch)
-else()
-    set(PATCHES common.pri.patch gl.patch)
-endif()
+set(PATCHES common.pri.patch gl.patch build.patch)
 
 if(NOT VCPKG_TARGET_IS_WINDOWS)
     list(APPEND CORE_OPTIONS "BUILD_OPTIONS" "-webengine-system-libwebp" "-webengine-system-ffmpeg" "-webengine-system-icu")
diff --git a/ports/qt5-webglplugin/CONTROL b/ports/qt5-webglplugin/CONTROL
index f5bbfe0f2..a88cf3448 100644
--- a/ports/qt5-webglplugin/CONTROL
+++ b/ports/qt5-webglplugin/CONTROL
@@ -1,4 +1,4 @@
 Source: qt5-webglplugin
-Version: 5.12.8
+Version: 5.15.0
 Description: Qt5 webglplugin Module; 
-Build-Depends:  qt5-base
+Build-Depends:  qt5-base[core]
diff --git a/ports/qt5-websockets/CONTROL b/ports/qt5-websockets/CONTROL
index 4ac991edd..a3f54c4cf 100644
--- a/ports/qt5-websockets/CONTROL
+++ b/ports/qt5-websockets/CONTROL
@@ -1,4 +1,4 @@
 Source: qt5-websockets
-Version: 5.12.8
+Version: 5.15.0
 Description: Qt5 Web Sockets Module - provides WebSocket communication compliant with RFC 6455
-Build-Depends:  qt5-base, qt5-declarative
+Build-Depends:  qt5-base[core], qt5-declarative
diff --git a/ports/qt5-webview/CONTROL b/ports/qt5-webview/CONTROL
index 54b7b3935..bffc35cde 100644
--- a/ports/qt5-webview/CONTROL
+++ b/ports/qt5-webview/CONTROL
@@ -1,4 +1,4 @@
 Source: qt5-webview
-Version: 5.12.8
+Version: 5.15.0
 Description: Qt5 WebView module - Provides a way to display web content in a QML application without necessarily including a full web browser stack by using native APIs where it makes sense.
 Build-Depends:  qt5-declarative
diff --git a/ports/qt5-winextras/CONTROL b/ports/qt5-winextras/CONTROL
index 8bb6a574c..ecf111342 100644
--- a/ports/qt5-winextras/CONTROL
+++ b/ports/qt5-winextras/CONTROL
@@ -1,5 +1,5 @@
 Source: qt5-winextras
-Version: 5.12.8
+Version: 5.15.0
 Description: Qt5 Windows Extras Module. Provides platform-specific APIs for Windows.
-Build-Depends:  qt5-base, atlmfc (windows), qt5-declarative, qt5-multimedia
-Supports: windows
\ No newline at end of file
+Build-Depends:  qt5-base[core], atlmfc (windows), qt5-declarative, qt5-multimedia
+Supports: windows
diff --git a/ports/qt5-x11extras/CONTROL b/ports/qt5-x11extras/CONTROL
index df68f3948..93ae3cdda 100644
--- a/ports/qt5-x11extras/CONTROL
+++ b/ports/qt5-x11extras/CONTROL
@@ -1,4 +1,4 @@
 Source: qt5-x11extras
-Version: 5.12.8
+Version: 5.15.0
 Description: Qt5 x11extras Module; 
-Build-Depends:  qt5-base
+Build-Depends:  qt5-base[core]
diff --git a/ports/qt5-xmlpatterns/CONTROL b/ports/qt5-xmlpatterns/CONTROL
index 2005ce3a9..d89408769 100644
--- a/ports/qt5-xmlpatterns/CONTROL
+++ b/ports/qt5-xmlpatterns/CONTROL
@@ -1,4 +1,4 @@
 Source: qt5-xmlpatterns
-Version: 5.12.8
+Version: 5.15.0
 Description: Qt5 XML Patterns Module - Support for XPath, XQuery, XSLT and XML schema validation
-Build-Depends:  qt5-base, qt5-declarative
+Build-Depends:  qt5-base[core], qt5-declarative
diff --git a/ports/qt5/CONTROL b/ports/qt5/CONTROL
index 5498a6982..0f5121a28 100644
--- a/ports/qt5/CONTROL
+++ b/ports/qt5/CONTROL
@@ -1,8 +1,8 @@
 Source: qt5
-Version: 5.12.8
+Version: 5.15.0
 Homepage: https://www.qt.io/
 Description: Qt5 Application Framework
-Build-Depends: qt5-base
+Build-Depends: qt5-base[core]
 Default-Features: essentials, default
 
 Feature: essentials
@@ -168,7 +168,3 @@ Description:
 Feature: connectivity
 Build-Depends: qt5-connectivity
 Description: 
-
-Feature: canvas3d
-Build-Depends: qt5-canvas3d
-Description: deprecated and removed in latest
\ No newline at end of file
diff --git a/ports/qtkeychain/CONTROL b/ports/qtkeychain/CONTROL
index d054322cf..2e019cc77 100644
--- a/ports/qtkeychain/CONTROL
+++ b/ports/qtkeychain/CONTROL
@@ -1,4 +1,4 @@
 Source: qtkeychain
-Version: v0.9.1
+Version: v0.9.1-1
 Description:  qtkeychain - Platform-independent Qt API for storing passwords securely
-Build-Depends: qt5-base, qt5-tools
\ No newline at end of file
+Build-Depends: qt5-base[core], qt5-tools
\ No newline at end of file
diff --git a/ports/qwt/CONTROL b/ports/qwt/CONTROL
index 54c1c88bb..4a2407b34 100644
--- a/ports/qwt/CONTROL
+++ b/ports/qwt/CONTROL
@@ -1,5 +1,5 @@
 Source: qwt
-Version: 6.1.3-12
+Version: 6.1.4
 Homepage: https://sourceforge.net/projects/qwt
 Description: Qt widgets library for technical applications
-Build-Depends: qt5-base, qt5-svg, qt5-tools
+Build-Depends: qt5-base[core], qt5-svg, qt5-tools
diff --git a/ports/qwt/build.patch b/ports/qwt/build.patch
new file mode 100644
index 000000000..8b36bb833
--- /dev/null
+++ b/ports/qwt/build.patch
@@ -0,0 +1,135 @@
+diff --git a/src/qwt_compass_rose.cpp b/src/qwt_compass_rose.cpp
+index 8acb045c2..b7b676712 100644
+--- a/src/qwt_compass_rose.cpp	
++++ b/src/qwt_compass_rose.cpp
+@@ -11,6 +11,7 @@
+ #include "qwt_point_polar.h"
+ #include "qwt_painter.h"
+ #include <qpainter.h>
++#include <QPainterPath>
+ 
+ static QPointF qwtIntersection(
+     QPointF p11, QPointF p12, QPointF p21, QPointF p22 )
+diff --git a/src/qwt_dial_needle.cpp b/src/qwt_dial_needle.cpp
+index 3589b011d..4f20aada1 100644
+--- a/src/qwt_dial_needle.cpp	
++++ b/src/qwt_dial_needle.cpp
+@@ -13,6 +13,7 @@
+ #include "qwt_painter.h"
+ #include <qapplication.h>
+ #include <qpainter.h>
++#include <QPainterPath>
+ 
+ #if QT_VERSION < 0x040601
+ #define qFastSin(x) qSin(x)
+diff --git a/src/qwt_null_paintdevice.cpp b/src/qwt_null_paintdevice.cpp
+index 21b97b0ad..545804b06 100644
+--- a/src/qwt_null_paintdevice.cpp	
++++ b/src/qwt_null_paintdevice.cpp
+@@ -10,6 +10,7 @@
+ #include "qwt_null_paintdevice.h"
+ #include <qpaintengine.h>
+ #include <qpixmap.h>
++#include <QPainterPath>
+ 
+ class QwtNullPaintDevice::PrivateData
+ {
+diff --git a/src/qwt_painter.cpp b/src/qwt_painter.cpp
+index 069e2ae42..824ddfc20 100644
+--- a/src/qwt_painter.cpp	
++++ b/src/qwt_painter.cpp
+@@ -27,6 +27,7 @@
+ #include <qpaintengine.h>
+ #include <qapplication.h>
+ #include <qdesktopwidget.h>
++#include <QPainterPath>
+ 
+ #if QT_VERSION >= 0x050000
+ #include <qwindow.h>
+diff --git a/src/qwt_painter_command.h b/src/qwt_painter_command.h
+index 032d0348b..13db43559 100644
+--- a/src/qwt_painter_command.h	
++++ b/src/qwt_painter_command.h
+@@ -15,8 +15,7 @@
+ #include <qpixmap.h>
+ #include <qimage.h>
+ #include <qpolygon.h>
+-
+-class QPainterPath;
++#include <QPainterPath>
+ 
+ /*!
+   QwtPainterCommand represents the attributes of a paint operation
+diff --git a/src/qwt_plot_glcanvas.cpp b/src/qwt_plot_glcanvas.cpp
+index 64b39b90e..414cb22c5 100644
+--- a/src/qwt_plot_glcanvas.cpp	
++++ b/src/qwt_plot_glcanvas.cpp
+@@ -15,6 +15,7 @@
+ #include <qdrawutil.h>
+ #include <qstyle.h>
+ #include <qstyleoption.h>
++#include <QPainterPath>
+ 
+ #define FIX_GL_TRANSLATION 0
+ 
+diff --git a/src/qwt_plot_glcanvas.h b/src/qwt_plot_glcanvas.h
+index 82770747f..be93232c4 100644
+--- a/src/qwt_plot_glcanvas.h	
++++ b/src/qwt_plot_glcanvas.h
+@@ -13,6 +13,7 @@
+ #include "qwt_global.h"
+ #include <qframe.h>
+ #include <qgl.h>
++#include <QPainterPath>
+ 
+ class QwtPlot;
+ 
+diff --git a/src/qwt_plot_panner.cpp b/src/qwt_plot_panner.cpp
+index bed4566dd..852998f01 100644
+--- a/src/qwt_plot_panner.cpp	
++++ b/src/qwt_plot_panner.cpp
+@@ -14,6 +14,7 @@
+ #include <qbitmap.h>
+ #include <qstyle.h>
+ #include <qstyleoption.h>
++#include <QPainterPath>
+ 
+ #if QT_VERSION >= 0x050000
+ #if QT_VERSION < 0x050100
+diff --git a/src/qwt_plot_renderer.cpp b/src/qwt_plot_renderer.cpp
+index b6c83447e..a309fe290 100644
+--- a/src/qwt_plot_renderer.cpp	
++++ b/src/qwt_plot_renderer.cpp
+@@ -26,6 +26,7 @@
+ #include <qfileinfo.h>
+ #include <qimagewriter.h>
+ #include <qvariant.h>
++#include <QPainterPath>
+ 
+ #ifndef QWT_NO_SVG
+ #ifdef QT_SVG_LIB
+diff --git a/src/qwt_widget_overlay.cpp b/src/qwt_widget_overlay.cpp
+index 79c46ce10..f64042ac8 100644
+--- a/src/qwt_widget_overlay.cpp	
++++ b/src/qwt_widget_overlay.cpp
+@@ -13,6 +13,7 @@
+ #include <qpaintengine.h>
+ #include <qimage.h>
+ #include <qevent.h>
++#include <QPainterPath>
+ 
+ static QImage::Format qwtMaskImageFormat()
+ {
+diff --git a/src/src.pri b/src/src.pri
+index 571870361..412636d5b 100644
+--- a/src/src.pri	
++++ b/src/src.pri
+@@ -7,7 +7,7 @@
+ # modify it under the terms of the Qwt License, Version 1.0
+ ################################################################
+ 
+-
++QT += gui
+ HEADERS += \
+     qwt.h \
+     qwt_abstract_scale_draw.h \
diff --git a/ports/qwt/fix-dynamic-static.patch b/ports/qwt/fix-dynamic-static.patch
index b608681f2..918934670 100644
--- a/ports/qwt/fix-dynamic-static.patch
+++ b/ports/qwt/fix-dynamic-static.patch
@@ -12,4 +12,4 @@ index 1fe6055..441c69b 100644
 +}
  
  ######################################################################
- # QwtPlot enables all classes, that are needed to use the QwtPlot 
+ # QwtPlot enables all classes, that are needed to use the QwtPlot
diff --git a/ports/qwt/portfile.cmake b/ports/qwt/portfile.cmake
index bd9c4e502..bbf03abc1 100644
--- a/ports/qwt/portfile.cmake
+++ b/ports/qwt/portfile.cmake
@@ -1,10 +1,11 @@
 vcpkg_from_sourceforge(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO qwt/qwt
-    REF 6.1.3
-    FILENAME "qwt-6.1.3.zip"
-    SHA512 8f249e23d50f71d14fca37776ea40d8d6931db14d9602e03a343bfb7a9bf55502202103135b77f583c3890a7924220e8a142a01c448dbde311860d89a3b10fc8
+    REF 6.1.4
+    FILENAME "qwt-6.1.4.zip"
+    SHA512 711256ec4d1d54d201650e9c63b584b17a61dbedde5a581e0b6227fdbee149cdbe2a889aa58f67777125b6471fc1fe248992ec845eb6481a2dfc2c4276701d7f
     PATCHES fix-dynamic-static.patch
+            build.patch
 )
 
 vcpkg_configure_qmake(
@@ -27,7 +28,7 @@ endif()
 
 #Install the header files
 file(GLOB HEADER_FILES ${SOURCE_PATH}/src/*.h)
-file(INSTALL ${HEADER_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/include/qwt)
+file(INSTALL ${HEADER_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/include/${PORT})
 
 # Handle copyright
-file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
\ No newline at end of file
diff --git a/ports/soqt/CONTROL b/ports/soqt/CONTROL
index 9d9dc7926..2fbde418b 100644
--- a/ports/soqt/CONTROL
+++ b/ports/soqt/CONTROL
@@ -1,6 +1,6 @@
 Source: soqt
-Version: 1.6.0
+Version: 1.6.0-1
 Description: A Qt Gui-toolkit binding for Coin
-Build-Depends: coin, qt5-base
+Build-Depends: coin, qt5-base[core]
 Homepage: https://github.com/coin3d/soqt
 Supports: !(arm|arm64|uwp)
diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt
index 5079b1abf..262165768 100644
--- a/scripts/ci.baseline.txt
+++ b/scripts/ci.baseline.txt
@@ -1424,6 +1424,13 @@ qpid-proton:x64-uwp=fail
 qpid-proton:x64-windows-static=fail
 qt5-activeqt:x64-linux=fail
 qt5-activeqt:x64-osx=fail
+# Skip deprecated Qt module 
+# (remnove after 1 year or longer due to vcpkg upgrade not handling removed ports correctly)
+qt5-canvas3d:x64-linux=skip
+qt5-canvas3d:x64-osx=skip
+qt5-canvas3d:x64-windows=skip
+qt5-canvas3d:x64-windows-static=skip
+qt5-canvas3d:x86-windows=skip
 qt5-macextras:x64-linux=fail
 qt5-macextras:x64-windows=fail
 qt5-macextras:x64-windows-static=fail
@@ -1436,12 +1443,14 @@ qt5-wayland:x64-windows=fail
 qt5-wayland:x64-windows-static=fail
 qt5-winextras:x64-linux=fail
 qt5-winextras:x64-osx=fail
-# Too big for CI.
-qt5-webengine:x64-windows=skip
-qt5-webengine:x86-windows=skip
 # Missing prerequisites for CI success
 qt5-webengine:x64-linux=fail
 qt5-webengine:x64-osx=fail
+# Fail due to outdated protoc headers.
+# D:\buildtrees\qt5-webengine\x64-windows-dbg\src\core\debug\gen\net/third_party/quiche/src/quic/core/proto/cached_network_parameters.pb.h(17):
+# fatal error C1189: #error:  This file was generated by an older version of protoc which is
+qt5-webengine:x64-windows=skip
+qt5-webengine:x86-windows=skip
 # Static builds of qt5-webengine are not supported by the port itself
 qt5-webengine:x64-windows-static=skip
 # Missing system libraries